Fix enablement path for CNI (istio#522)

* Fix enablement path for CNI * Fix tests
sdake · Nov 5, 2019 · 32c592d · 32c592d
1 parent 388e0a0
commit 32c592d
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 21 deletions.
diff --git a/cmd/mesh/testdata/manifest-generate/output/all_on.yaml b/cmd/mesh/testdata/manifest-generate/output/all_on.yaml
diff --git a/cmd/mesh/testdata/manifest-generate/output/flag_output_set_values.yaml b/cmd/mesh/testdata/manifest-generate/output/flag_output_set_values.yaml
diff --git a/cmd/mesh/testdata/manifest-generate/output/flag_set_values.yaml b/cmd/mesh/testdata/manifest-generate/output/flag_set_values.yaml
diff --git a/cmd/mesh/testdata/profile-dump/output/all_off.yaml b/cmd/mesh/testdata/profile-dump/output/all_off.yaml
@@ -10,9 +10,6 @@ autoInjection:
             maxUnavailable: 25%
   enabled: false
 cni:
-  components:
-    cni:
-      enabled: false
   enabled: false
 configManagement:
   components:

diff --git a/cmd/mesh/testdata/profile-dump/output/demo-auth_certmanager_on.yaml b/cmd/mesh/testdata/profile-dump/output/demo-auth_certmanager_on.yaml
@@ -10,9 +10,6 @@ autoInjection:
             maxUnavailable: 25%
   enabled: true
 cni:
-  components:
-    cni:
-      enabled: false
   enabled: false
 configManagement:
   components:

diff --git a/cmd/mesh/testdata/profile-dump/output/sds_policy_off.yaml b/cmd/mesh/testdata/profile-dump/output/sds_policy_off.yaml
@@ -10,9 +10,6 @@ autoInjection:
             maxUnavailable: 25%
   enabled: true
 cni:
-  components:
-    cni:
-      enabled: false
   enabled: false
 configManagement:
   components:

diff --git a/data/profiles/default.yaml b/data/profiles/default.yaml
@@ -230,9 +230,6 @@ spec:
   # Istio CNI feature
   cni:
     enabled: false
-    components:
-      cni:
-        enabled: false
 
   # Global values passed through to helm global.yaml.
   values:

diff --git a/pkg/translate/translate.go b/pkg/translate/translate.go
@@ -311,7 +311,13 @@ func (t *Translator) setEnablementAndNamespaces(root map[string]interface{}, icp
 		if err != nil {
 			return err
 		}
-		if err := tpath.WriteNode(root, util.PathFromString(c.ToHelmValuesTreeRoot+"."+HelmValuesEnabledSubpath), e); err != nil {
+
+		enablementPath := c.ToHelmValuesTreeRoot
+		// CNI calls itself "cni" in the chart but "istio_cni" for enablement outside of the chart.
+		if cn == name.CNIComponentName {
+			enablementPath = "istio_cni"
+		}
+		if err := tpath.WriteNode(root, util.PathFromString(enablementPath+"."+HelmValuesEnabledSubpath), e); err != nil {
 			return err
 		}
 

diff --git a/pkg/translate/translate_test.go b/pkg/translate/translate_test.go
@@ -40,7 +40,6 @@ defaultNamespace: istio-system
   enabled: false
   namespace: istio-system
 cni:
-  enabled: false
   namespace: istio-system
 galley:
   enabled: false
@@ -64,6 +63,8 @@ global:
 grafana:
   enabled: false
   namespace: istio-system
+istio_cni:
+  enabled: false
 kiali:
   enabled: false
   namespace: istio-system
@@ -106,7 +107,6 @@ defaultNamespace: istio-system
   enabled: false
   namespace: istio-system
 cni:
-  enabled: false
   namespace: istio-system
 galley:
   enabled: false
@@ -132,6 +132,8 @@ global:
 grafana:
   enabled: false
   namespace: istio-system
+istio_cni:
+  enabled: false
 kiali:
   enabled: false
   namespace: istio-system

diff --git a/pkg/vfs/assets.gen.go b/pkg/vfs/assets.gen.go