fix(cni): pass experimental image version to install command (#4695)

* fix(cni): pass experimental image version to the default control plane install Signed-off-by: slonka <slonka@users.noreply.github.com>
kumahq · Aug 3, 2022 · e3969e8 · e3969e8
1 parent f4afd69
commit e3969e8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/app/kumactl/cmd/completion/testdata/bash.golden b/app/kumactl/cmd/completion/testdata/bash.golden
@@ -3430,8 +3430,6 @@ _kumactl_install_control-plane()
     local_nonpersistent_flags+=("--cni-conf-name=")
     flags+=("--cni-enabled")
     local_nonpersistent_flags+=("--cni-enabled")
-    flags+=("--cni-experimental")
-    local_nonpersistent_flags+=("--cni-experimental")
     flags+=("--cni-net-dir=")
     two_word_flags+=("--cni-net-dir")
     local_nonpersistent_flags+=("--cni-net-dir")

diff --git a/app/kumactl/cmd/install/context/install_control_plane_context.go b/app/kumactl/cmd/install/context/install_control_plane_context.go
@@ -41,6 +41,8 @@ type InstallControlPlaneArgs struct {
 	Cni_image_registry                           string            `helm:"cni.image.registry,omitempty"`
 	Cni_image_repository                         string            `helm:"cni.image.repository"`
 	Cni_image_tag                                string            `helm:"cni.image.tag"`
+	Cni_imageExperimental_repository             string            `helm:"cni.imageExperimental.repository"`
+	Cni_imageExperimental_tag                    string            `helm:"cni.imageExperimental.tag"`
 	Cni_nodeSelector                             map[string]string `helm:"cni.nodeSelector"`
 	ControlPlane_mode                            string            `helm:"controlPlane.mode"`
 	ControlPlane_zone                            string            `helm:"controlPlane.zone"`
@@ -104,6 +106,8 @@ func DefaultInstallCpContext() InstallCpContext {
 			Cni_image_registry:                      "",
 			Cni_image_repository:                    "install-cni",
 			Cni_image_tag:                           "0.0.10",
+			Cni_imageExperimental_repository:        "kuma-cni",
+			Cni_imageExperimental_tag:               kuma_version.Build.Version,
 			ControlPlane_mode:                       core.Standalone,
 			ControlPlane_zone:                       "",
 			ControlPlane_globalZoneSyncService_type: "LoadBalancer",

diff --git a/app/kumactl/cmd/install/install_control_plane.go b/app/kumactl/cmd/install/install_control_plane.go
@@ -35,6 +35,7 @@ func (cv *componentVersion) Set(v string) error {
 	cv.args.ControlPlane_image_tag = v
 	cv.args.DataPlane_image_tag = v
 	cv.args.DataPlane_initImage_tag = v
+	cv.args.Cni_imageExperimental_tag = v
 	return nil
 }
 
@@ -184,7 +185,6 @@ This command requires that the KUBECONFIG environment is set`,
 	cmd.Flags().StringVar(&args.DataPlane_initImage_tag, "dataplane-init-version", args.DataPlane_initImage_tag, "version of the init image of the Kuma DataPlane component")
 	cmd.Flags().StringVar(&args.ControlPlane_kdsGlobalAddress, "kds-global-address", args.ControlPlane_kdsGlobalAddress, "URL of Global Kuma CP (example: grpcs://192.168.0.1:5685)")
 	cmd.Flags().BoolVar(&args.Cni_enabled, "cni-enabled", args.Cni_enabled, "install Kuma with CNI instead of proxy init container")
-	cmd.Flags().BoolVar(&args.Cni_experimental, "cni-experimental", args.Cni_experimental, "install Kuma with new version of the CNI (experimental)")
 	cmd.Flags().BoolVar(&args.Cni_chained, "cni-chained", args.Cni_chained, "enable chained CNI installation")
 	cmd.Flags().StringVar(&args.Cni_net_dir, "cni-net-dir", args.Cni_net_dir, "set the CNI install directory")
 	cmd.Flags().StringVar(&args.Cni_bin_dir, "cni-bin-dir", args.Cni_bin_dir, "set the CNI binary directory")

diff --git a/app/kumactl/cmd/install/install_control_plane_test.go b/app/kumactl/cmd/install/install_control_plane_test.go
@@ -189,8 +189,9 @@ var _ = Describe("kumactl install control-plane", func() {
 		Entry("should generate Kubernetes resources with new CNI plugin (experimental)", testCase{
 			extraArgs: []string{
 				"--cni-enabled",
-				"--cni-experimental",
 				"--without-kubernetes-connection",
+				"--set",
+				"experimental.cni=true",
 			},
 			goldenFile: "install-control-plane.cni-experimental-enabled.golden.yaml",
 		}),

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.cni-experimental-enabled.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.cni-experimental-enabled.golden.yaml
@@ -2035,7 +2035,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
         - name: install-cni
-          image: "docker.io/kumahq/kuma-cni:1.7.0"
+          image: "docker.io/kumahq/kuma-cni:0.0.1"
           imagePullPolicy: IfNotPresent
           command: ["/install-cni"]
           env:

diff --git a/docs/generated/cmd/kumactl/kumactl_install_control-plane.md b/docs/generated/cmd/kumactl/kumactl_install_control-plane.md
@@ -18,7 +18,6 @@ kumactl install control-plane [flags]
       --cni-chained                                  enable chained CNI installation
       --cni-conf-name string                         set the CNI configuration name (default "kuma-cni.conf")
       --cni-enabled                                  install Kuma with CNI instead of proxy init container
-      --cni-experimental                             install Kuma with new version of the CNI (experimental)
       --cni-net-dir string                           set the CNI install directory (default "/etc/cni/multus/net.d")
       --cni-node-selector stringToString             node selector for CNI deployment (default [])
       --cni-registry string                          registry for the image of the Kuma CNI component

diff --git a/test/framework/k8s_cluster.go b/test/framework/k8s_cluster.go
@@ -323,10 +323,6 @@ func (c *K8sCluster) yamlForKumaViaKubectl(mode string) (string, error) {
 		argsMap["--cni-conf-name"] = Config.CNIConf.ConfName
 	}
 
-	if c.opts.cniExperimental {
-		argsMap["--cni-experimental"] = ""
-	}
-
 	if Config.XDSApiVersion != "" {
 		argsMap["--env-var"] = "KUMA_BOOTSTRAP_SERVER_API_VERSION=" + Config.XDSApiVersion
 	}