Deprecate colour codes, stop sending them to Submariner

These aren't used, let's drop them. Signed-off-by: Stephen Kitt <[email protected]>
submariner-io · Jan 18, 2022 · 0d0e16f · 0d0e16f
1 parent 7f203c3
commit 0d0e16f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/api/submariner/v1alpha1/submariner_types.go b/api/submariner/v1alpha1/submariner_types.go
@@ -124,7 +124,6 @@ type (
 )
 
 const (
-	DefaultColorCode                     = "blue"
 	K8s                   KubernetesType = "k8s"
 	OCP                                  = "ocp"
 	EKS                                  = "eks"
@@ -219,7 +218,6 @@ func (s *Submariner) UnmarshalJSON(data []byte) error {
 		Spec: SubmarinerSpec{
 			Repository: DefaultRepo,
 			Version:    DefaultSubmarinerVersion,
-			ColorCodes: DefaultColorCode,
 		},
 	}
 

diff --git a/pkg/subctl/cmd/join.go b/pkg/subctl/cmd/join.go
@@ -62,7 +62,7 @@ var (
 	ikePort                       int
 	preferredServer               bool
 	forceUDPEncaps                bool
-	colorCodes                    string
+	ignoredColorCodes             string
 	natTraversal                  bool
 	ignoreRequirements            bool
 	globalnetEnabled              bool
@@ -93,7 +93,8 @@ func addJoinFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&clusterCIDR, "clustercidr", "", "cluster CIDR")
 	cmd.Flags().StringVar(&repository, "repository", "", "image repository")
 	cmd.Flags().StringVar(&imageVersion, "version", "", "image version")
-	cmd.Flags().StringVar(&colorCodes, "colorcodes", submariner.DefaultColorCode, "color codes")
+	cmd.Flags().StringVar(&ignoredColorCodes, "colorcodes", "", "color codes")
+	_ = cmd.Flags().MarkDeprecated("colorcodes", "--colorcodes has no effect and is deprecated")
 	cmd.Flags().IntVar(&nattPort, "nattport", 4500, "IPsec NATT port")
 	cmd.Flags().IntVar(&ikePort, "ikeport", 500, "IPsec IKE port")
 	cmd.Flags().BoolVar(&natTraversal, "natt", true, "enable NAT traversal for IPsec")
@@ -190,18 +191,9 @@ func joinSubmarinerCluster(subctlData *datafile.SubctlData) {
 		})
 	}
 
-	if colorCodes == "" {
-		qs = append(qs, &survey.Question{
-			Name:     "colorCodes",
-			Prompt:   &survey.Input{Message: "What color codes should be used (e.g. \"blue\")?"},
-			Validate: survey.Required,
-		})
-	}
-
 	if len(qs) > 0 {
 		answers := struct {
-			ClusterID  string
-			ColorCodes string
+			ClusterID string
 		}{}
 
 		err := survey.Ask(qs, &answers)
@@ -211,10 +203,6 @@ func joinSubmarinerCluster(subctlData *datafile.SubctlData) {
 		if len(answers.ClusterID) > 0 {
 			clusterID = answers.ClusterID
 		}
-
-		if len(answers.ColorCodes) > 0 {
-			colorCodes = answers.ColorCodes
-		}
 	}
 
 	clientConfig, err := restConfigProducer.ClientConfig().ClientConfig()
@@ -526,7 +514,6 @@ func populateSubmarinerSpec(subctlData *datafile.SubctlData, brokerSecret, pskSe
 		Broker:                   "k8s",
 		NatEnabled:               natTraversal,
 		Debug:                    submarinerDebug,
-		ColorCodes:               colorCodes,
 		ClusterID:                clusterID,
 		ServiceCIDR:              crServiceCIDR,
 		ClusterCIDR:              crClusterCIDR,

diff --git a/scripts/kind-e2e/lib_operator_verify_subm.sh b/scripts/kind-e2e/lib_operator_verify_subm.sh
@@ -31,7 +31,6 @@ function create_subm_vars() {
 
     # FIXME: Actually act on this size request in controller
     subm_gateway_size=3
-    subm_colorcodes=blue
     subm_debug=false
     subm_broker=k8s
     ce_ipsec_debug=false
@@ -208,7 +207,6 @@ function verify_subm_cr() {
   validate_equals '.spec.version' $subm_gateway_image_tag
   validate_equals '.spec.broker' $subm_broker
   echo "Generated cluster id: $(jq -r '.spec.clusterID' $json_file)"
-  validate_equals '.spec.colorCodes' $subm_colorcodes
   validate_equals '.spec.debug' $subm_debug
   validate_equals '.spec.namespace' $subm_ns
   validate_equals '.spec.natEnabled' $natEnabled
@@ -269,7 +267,6 @@ function verify_subm_gateway_pod() {
   validate_pod_container_env 'SUBMARINER_NAMESPACE' $subm_ns
   validate_pod_container_env 'SUBMARINER_SERVICECIDR' ${service_CIDRs[$cluster]}
   validate_pod_container_env 'SUBMARINER_CLUSTERCIDR' ${cluster_CIDRs[$cluster]}
-  validate_pod_container_env 'SUBMARINER_COLORCODES' $subm_colorcodes
   validate_pod_container_env 'SUBMARINER_DEBUG' $subm_debug
   validate_pod_container_env 'SUBMARINER_NATENABLED' $natEnabled
   validate_pod_container_env 'SUBMARINER_BROKER' $subm_broker
@@ -376,7 +373,6 @@ function verify_subm_gateway_container() {
   grep "BROKER_K8S_REMOTENAMESPACE=$SUBMARINER_BROKER_NS" $env_file
   grep "SUBMARINER_SERVICECIDR=${service_CIDRs[$cluster]}" $env_file
   grep "SUBMARINER_CLUSTERCIDR=${cluster_CIDRs[$cluster]}" $env_file
-  grep "SUBMARINER_COLORCODES=$subm_colorcode" $env_file
   grep "SUBMARINER_NATENABLED=$natEnabled" $env_file
   grep "HOME=/root" $env_file