Remove --cluster-name flag

I assert that #1347 is no longer an issue since we've removed the classic mode in #2327. Signed-off-by: Michi Mutsuzaki <[email protected]>
cilium · Feb 29, 2024 · 509702f · 509702f
1 parent a26c8a5
commit 509702f
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 17 deletions.
diff --git a/.github/in-cluster-test-scripts/eks-tunnel.sh b/.github/in-cluster-test-scripts/eks-tunnel.sh
@@ -4,10 +4,9 @@ set -x
 set -e
 
 # Install Cilium
-# We can't get rid of --cluster-name until we fix https://github.com/cilium/cilium-cli/issues/1347.
 cilium install \
   --version "${CILIUM_VERSION}" \
-  --cluster-name "${CLUSTER_NAME}" \
+  --set cluster.name="${CLUSTER_NAME}" \
   --wait=false \
   --set bpf.monitorAggregation=none \
   --datapath-mode=tunnel \

diff --git a/.github/in-cluster-test-scripts/eks.sh b/.github/in-cluster-test-scripts/eks.sh
@@ -6,7 +6,7 @@ set -e
 # Install Cilium
 cilium install \
   --version "${CILIUM_VERSION}" \
-  --cluster-name "${CLUSTER_NAME}" \
+  --set cluster.name="${CLUSTER_NAME}" \
   --wait=false \
   --set loadBalancer.l7.backend=envoy \
   --set tls.secretsBackend=k8s \

diff --git a/.github/in-cluster-test-scripts/external-workloads-install.sh b/.github/in-cluster-test-scripts/external-workloads-install.sh
@@ -4,10 +4,9 @@ set -x
 set -e
 
 # Install Cilium in cluster
-# We can't get rid of --cluster-name until we fix https://github.com/cilium/cilium-cli/issues/1347.
 cilium install \
   --version "${CILIUM_VERSION}" \
-  --cluster-name "${CLUSTER_NAME}" \
+  --set cluster.name="${CLUSTER_NAME}" \
   --set bpf.monitorAggregation=none \
   --datapath-mode=tunnel \
   --set kubeProxyReplacement=strict \

diff --git a/.github/in-cluster-test-scripts/gke.sh b/.github/in-cluster-test-scripts/gke.sh
@@ -4,10 +4,9 @@ set -x
 set -e
 
 # Install Cilium
-# We can't get rid of --cluster-name until we fix https://github.com/cilium/cilium-cli/issues/1347.
 cilium install \
   --version "${CILIUM_VERSION}" \
-  --cluster-name "${CLUSTER_NAME}" \
+  --set cluster.name="${CLUSTER_NAME}" \
   --set bpf.monitorAggregation=none \
   --set ipv4NativeRoutingCIDR="${CLUSTER_CIDR}" \
   --set loadBalancer.l7.backend=envoy \

diff --git a/.github/in-cluster-test-scripts/multicluster.sh b/.github/in-cluster-test-scripts/multicluster.sh
@@ -8,13 +8,12 @@ CONTEXT1=$(kubectl config view | grep "${CLUSTER_NAME_1}" | head -1 | awk '{prin
 CONTEXT2=$(kubectl config view | grep "${CLUSTER_NAME_2}" | head -1 | awk '{print $2}')
 
 # Install Cilium in cluster1
-# We can't get rid of --cluster-name until we fix https://github.com/cilium/cilium-cli/issues/1347.
 cilium install \
   --version "${CILIUM_VERSION}" \
   --context "${CONTEXT1}" \
   --set loadBalancer.l7.backend=envoy \
   --set tls.secretsBackend=k8s \
-  --cluster-name "${CLUSTER_NAME_1}" \
+  --set cluster.name="${CLUSTER_NAME_1}" \
   --set cluster.id=1 \
   --set bpf.monitorAggregation=none \
   --set ipv4NativeRoutingCIDR=10.0.0.0/9
@@ -32,7 +31,7 @@ cilium install \
   --context "${CONTEXT2}" \
   --set loadBalancer.l7.backend=envoy \
   --set tls.secretsBackend=k8s \
-  --cluster-name "${CLUSTER_NAME_2}" \
+  --set cluster.name="${CLUSTER_NAME_2}" \
   --set cluster.id=2 \
   --set bpf.monitorAggregation=none \
   --set ipv4NativeRoutingCIDR=10.0.0.0/9

diff --git a/clustermesh/clustermesh.go b/clustermesh/clustermesh.go
@@ -156,7 +156,7 @@ func (k *K8sClusterMesh) GetClusterConfig(ctx context.Context) error {
 	k.clusterName = clusterName
 
 	if clusterID == "0" || clusterName == "default" {
-		k.Log("⚠️  Cluster not configured for clustermesh, use '--cluster-id' and '--cluster-name' with 'cilium install'. External workloads may still be configured.")
+		k.Log("⚠️  Cluster not configured for clustermesh, use '--set cluster.id' and '--set cluster.name' with 'cilium install'. External workloads may still be configured.")
 	}
 
 	return nil

diff --git a/install/autodetect.go b/install/autodetect.go
@@ -137,7 +137,6 @@ func (k *K8sInstaller) autodetectAndValidate(ctx context.Context, helmValues map
 
 	k.Log("ℹ️  Using Cilium version %s", k.chartVersion)
 
-	// "cluster.name" Helm value takes precedence over --cluster-name flag.
 	clusterName := getClusterName(helmValues)
 	if clusterName != "" {
 		k.params.ClusterName = clusterName

diff --git a/install/helm.go b/install/helm.go
@@ -113,8 +113,6 @@ func (k *K8sInstaller) getHelmValues() (map[string]interface{}, error) {
 			}
 		}
 
-		// TODO: remove when removing "cluster-name" flag (marked as deprecated),
-		// kept for backwards compatibility
 		if k.params.ClusterName != "" {
 			helmMapOpts["cluster.name"] = k.params.ClusterName
 		}

diff --git a/internal/cli/cmd/install.go b/internal/cli/cmd/install.go
@@ -23,9 +23,6 @@ import (
 
 // addCommonInstallFlags adds install command flags that are shared between classic and helm mode.
 func addCommonInstallFlags(cmd *cobra.Command, params *install.Parameters) {
-	// We can't get rid of --cluster-name until we fix https://github.com/cilium/cilium-cli/issues/1347.
-	cmd.Flags().StringVar(&params.ClusterName, "cluster-name", "", "Name of the cluster")
-	cmd.Flags().MarkDeprecated("cluster-name", "This can now be overridden via `--set` (Helm value: `cluster.name`).")
 	cmd.Flags().StringVar(&params.Version, "version", defaults.Version, "Cilium version to install")
 	cmd.Flags().StringVar(&params.DatapathMode, "datapath-mode", "", "Datapath mode to use { tunnel | native | aws-eni | gke | azure | aks-byocni } (default: autodetected).")
 	cmd.Flags().BoolVar(&params.ListVersions, "list-versions", false, "List all the available versions without actually installing")