Set CNI namespace as kube-system by default (#732)

* Set CNI namespace as kube-system Signed-off-by: Chun Lin Yang <[email protected]> * Fix test failure issues
istio · Jan 6, 2020 · 741b7a1 · 741b7a1
1 parent a2929d0
commit 741b7a1
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 13 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_profile.yaml b/cmd/mesh/testdata/manifest-generate/output/flag_output_set_profile.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/manifest-generate/output/pilot_default.yaml b/cmd/mesh/testdata/manifest-generate/output/pilot_default.yaml
diff --git a/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.yaml b/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.yaml
diff --git a/cmd/mesh/testdata/manifest-generate/output/pilot_override_kubernetes.yaml b/cmd/mesh/testdata/manifest-generate/output/pilot_override_kubernetes.yaml
diff --git a/cmd/mesh/testdata/manifest-generate/output/pilot_override_values.yaml b/cmd/mesh/testdata/manifest-generate/output/pilot_override_values.yaml
diff --git a/cmd/mesh/testdata/profile-dump/output/all_off.yaml b/cmd/mesh/testdata/profile-dump/output/all_off.yaml
@@ -16,6 +16,9 @@ base:
   enabled: true
 cni:
   enabled: false
+  components:
+    cni:
+      namespace: kube-system
 configManagement:
   components:
     galley:

diff --git a/cmd/mesh/testdata/profile-dump/output/sds_policy_off.yaml b/cmd/mesh/testdata/profile-dump/output/sds_policy_off.yaml
@@ -16,6 +16,9 @@ base:
   enabled: true
 cni:
   enabled: false
+  components:
+    cni:
+      namespace: kube-system
 configManagement:
   components:
     galley:

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

diff --git a/pkg/translate/translate_test.go b/pkg/translate/translate_test.go
@@ -35,12 +35,16 @@ func TestProtoToValuesV13(t *testing.T) {
 			desc: "default success",
 			yamlStr: `
 defaultNamespace: istio-system
+cni:
+  components:
+    cni:
+      namespace: kube-system
 `,
 			want: `certmanager:
   enabled: false
   namespace: istio-system
 cni:
-  namespace: istio-system
+  namespace: kube-system
 galley:
   enabled: false
   namespace: istio-system
@@ -102,12 +106,16 @@ tracing:
 hub: docker.io/istio
 tag: 1.2.3
 defaultNamespace: istio-system
+cni:
+  components:
+    cni:
+      namespace: kube-system
 `,
 			want: `certmanager:
   enabled: false
   namespace: istio-system
 cni:
-  namespace: istio-system
+  namespace: kube-system
 galley:
   enabled: false
   namespace: istio-system

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