chore: fix bad merge

Signed-off-by: slonka <slonka@users.noreply.github.com>
kumahq · Aug 4, 2022 · 55a9aa8 · 55a9aa8
1 parent 63c05ee
commit 55a9aa8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
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,8 +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_experimental_image_repository            string            `helm:"cni.experimental.image.repository"`
+	Cni_experimental_image_tag                   string            `helm:"cni.experimental.image.tag"`
 	Cni_nodeSelector                             map[string]string `helm:"cni.nodeSelector"`
 	ControlPlane_mode                            string            `helm:"controlPlane.mode"`
 	ControlPlane_zone                            string            `helm:"controlPlane.zone"`
@@ -106,8 +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,
+			Cni_experimental_image_repository:       "kuma-cni",
+			Cni_experimental_image_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,7 +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
+	cv.args.Cni_experimental_image_tag = v
 	return nil
 }
 

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
@@ -1988,7 +1988,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
           readinessProbe:
             initialDelaySeconds: 0