fix: properly propagate flags used for kubeproxyreplacement

Signed-off-by: Jonathan Grahl <[email protected]>
cilium · Oct 16, 2023 · 5106a98 · 5106a98
1 parent 951eb91
commit 5106a98
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/install/autodetect.go b/install/autodetect.go
@@ -198,11 +198,20 @@ func (k *K8sInstaller) autodetectAndValidate(ctx context.Context, helmValues map
 		return fmt.Errorf("invalid encryption mode")
 	}
 
-	k.autodetectKubeProxy(ctx)
+	var apiServerHost, apiServerPort string
+
+	if host, ok := helmValues["k8sServiceHost"].(string); !ok {
+		apiServerHost = host
+	}
+	if port, ok := helmValues["k8sServicePort"].(string); !ok {
+		apiServerPort = port
+	}
+
+	k.autodetectKubeProxy(ctx, apiServerHost, apiServerPort)
 	return k.autoEnableBPFMasq()
 }
 
-func (k *K8sInstaller) autodetectKubeProxy(ctx context.Context) error {
+func (k *K8sInstaller) autodetectKubeProxy(ctx context.Context, apiServerHost string, apiServerPort string) error {
 	if k.params.UserSetKubeProxyReplacement {
 		return nil
 	} else if k.flavor.Kind == k8s.KindK3s {
@@ -223,7 +232,7 @@ func (k *K8sInstaller) autodetectKubeProxy(ctx context.Context) error {
 			return nil
 		}
 	}
-	apiServerHost, apiServerPort := k.client.GetAPIServerHostAndPort()
+
 	if k.flavor.Kind == k8s.KindKind {
 		k.Log("ℹ️  Detecting real Kubernetes API server addr and port on Kind")
 

diff --git a/internal/cli/cmd/install.go b/internal/cli/cmd/install.go
@@ -41,7 +41,7 @@ cilium install --context kind-cluster1 --cluster-id 1 --cluster-name cluster1
 			params.Namespace = namespace
 
 			cmd.Flags().Visit(func(f *pflag.Flag) {
-				if f.Name == "helm-set" && strings.Contains(f.Value.String(), "kubeProxyReplacement") {
+				if f.Name == "set" && strings.Contains(f.Value.String(), "kubeProxyReplacement") {
 					params.UserSetKubeProxyReplacement = true
 				}
 			})
@@ -266,6 +266,11 @@ cilium install
 cilium install --context kind-cluster1 --set cluster.id=1 --set cluster.name=cluster1
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
+			cmd.Flags().Visit(func(f *pflag.Flag) {
+				if f.Name == "set" && strings.Contains(f.Value.String(), "kubeProxyReplacement") {
+					params.UserSetKubeProxyReplacement = true
+				}
+			})
 			params.Namespace = namespace
 			// Don't log anything if it's a dry run so that the dry run output can easily be piped to other commands.
 			if params.DryRun || params.DryRunHelmValues {
@@ -344,6 +349,11 @@ cilium upgrade
 cilium upgrade --helm-set cluster.id=1 --helm-set cluster.name=cluster1
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
+			cmd.Flags().Visit(func(f *pflag.Flag) {
+				if f.Name == "set" && strings.Contains(f.Value.String(), "kubeProxyReplacement") {
+					params.UserSetKubeProxyReplacement = true
+				}
+			})
 			params.Namespace = namespace
 			// Don't log anything if it's a dry run so that the dry run output can easily be piped to other commands.
 			if params.DryRun || params.DryRunHelmValues {