Use real MeshConfig for injection tests (#24808)

rh-bjeon · Jun 19, 2020 · 2fdf6cd · 2fdf6cd
1 parent 8201457
commit 2fdf6cd
Show file tree

Hide file tree

Showing 60 changed files with 274 additions and 78 deletions.
diff --git a/pkg/kube/inject/inject_test.go b/pkg/kube/inject/inject_test.go
@@ -302,11 +302,10 @@ func TestIntoResourceFile(t *testing.T) {
 		testName := fmt.Sprintf("[%02d] %s", i, c.want)
 		t.Run(testName, func(t *testing.T) {
 			t.Parallel()
-			m := mesh.DefaultMeshConfig()
+			sidecarTemplate, valuesConfig, m := loadInjectionSettings(t, c.setFlags, c.inFilePath)
 			if c.mesh != nil {
-				c.mesh(&m)
+				c.mesh(m)
 			}
-			sidecarTemplate, valuesConfig := loadInjectionConfigMap(t, c.setFlags, c.inFilePath)
 			inputFilePath := "testdata/inject/" + c.in
 			wantFilePath := "testdata/inject/" + c.want
 			in, err := os.Open(inputFilePath)
@@ -315,7 +314,7 @@ func TestIntoResourceFile(t *testing.T) {
 			}
 			defer func() { _ = in.Close() }()
 			var got bytes.Buffer
-			if err = IntoResourceFile(sidecarTemplate.Template, valuesConfig, "", &m, in, &got); err != nil {
+			if err = IntoResourceFile(sidecarTemplate.Template, valuesConfig, "", m, in, &got); err != nil {
 				t.Fatalf("IntoResourceFile(%v) returned an error: %v", inputFilePath, err)
 			}
 
@@ -414,8 +413,7 @@ func TestRewriteAppProbe(t *testing.T) {
 	for i, c := range cases {
 		testName := fmt.Sprintf("[%02d] %s", i, c.want)
 		t.Run(testName, func(t *testing.T) {
-			m := mesh.DefaultMeshConfig()
-			sidecarTemplate, valuesConfig := loadInjectionConfigMap(t, nil, "")
+			sidecarTemplate, valuesConfig, m := loadInjectionSettings(t, nil, "")
 			inputFilePath := "testdata/inject/app_probe/" + c.in
 			wantFilePath := "testdata/inject/app_probe/" + c.want
 			in, err := os.Open(inputFilePath)
@@ -424,7 +422,7 @@ func TestRewriteAppProbe(t *testing.T) {
 			}
 			defer func() { _ = in.Close() }()
 			var got bytes.Buffer
-			if err = IntoResourceFile(sidecarTemplate.Template, valuesConfig, "", &m, in, &got); err != nil {
+			if err = IntoResourceFile(sidecarTemplate.Template, valuesConfig, "", m, in, &got); err != nil {
 				t.Fatalf("IntoResourceFile(%v) returned an error: %v", inputFilePath, err)
 			}
 
@@ -469,7 +467,7 @@ func TestInvalidAnnotations(t *testing.T) {
 	m := mesh.DefaultMeshConfig()
 	for _, c := range cases {
 		t.Run(c.annotation, func(t *testing.T) {
-			sidecarTemplate, valuesConfig := loadInjectionConfigMap(t, nil, "")
+			sidecarTemplate, valuesConfig, _ := loadInjectionSettings(t, nil, "")
 			inputFilePath := "testdata/inject/" + c.in
 			in, err := os.Open(inputFilePath)
 			if err != nil {

diff --git a/...e/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml.injected b/...e/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml.injected
@@ -105,7 +105,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -131,6 +131,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/livez":{"httpGet":{"port":80}},"/app-health/hello/readyz":{"httpGet":{"port":3333}},"/app-health/world/livez":{"httpGet":{"port":90}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -194,6 +195,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/...inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml.injected b/...inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml.injected
@@ -102,7 +102,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -128,6 +128,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-proxy
@@ -189,6 +190,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml.injected
@@ -104,7 +104,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -127,6 +127,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/livez":{"httpGet":{"port":80}},"/app-health/hello/readyz":{"httpGet":{"port":3333}},"/app-health/world/livez":{"httpGet":{"port":90}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -190,6 +191,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml.injected
@@ -85,7 +85,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -106,6 +106,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/readyz":{"httpGet":{"path":"/ip","port":8000}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -169,6 +170,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml.injected
@@ -105,7 +105,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -128,6 +128,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/livez":{"httpGet":{"port":80}},"/app-health/hello/readyz":{"httpGet":{"port":3333,"scheme":"HTTPS"}},"/app-health/world/livez":{"httpGet":{"port":90}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -191,6 +192,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/named_port.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/named_port.yaml.injected
@@ -85,7 +85,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -106,6 +106,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/readyz":{"httpGet":{"port":80}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -169,6 +170,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/one_container.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/one_container.yaml.injected
@@ -89,7 +89,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -110,6 +110,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/livez":{"httpGet":{"port":80}},"/app-health/hello/readyz":{"httpGet":{"port":3333}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -173,6 +174,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml.injected
@@ -104,7 +104,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -127,6 +127,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/livez":{"httpGet":{"port":80}},"/app-health/hello/readyz":{"httpGet":{"port":3333}},"/app-health/world/livez":{"httpGet":{"port":90}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -190,6 +191,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml.injected
@@ -85,7 +85,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -106,6 +106,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/readyz":{"httpGet":{"port":3333}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -169,6 +170,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/startup_live.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/startup_live.yaml.injected
@@ -104,7 +104,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -127,6 +127,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/livez":{"httpGet":{"port":80}},"/app-health/hello/startupz":{"httpGet":{"port":3333}},"/app-health/world/livez":{"httpGet":{"port":90}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -190,6 +191,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/startup_only.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/startup_only.yaml.injected
@@ -85,7 +85,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -106,6 +106,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/startupz":{"httpGet":{"port":3333}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -169,6 +170,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/startup_ready_live.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/startup_ready_live.yaml.injected
@@ -112,7 +112,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -135,6 +135,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/livez":{"httpGet":{"port":80}},"/app-health/hello/readyz":{"httpGet":{"port":3333}},"/app-health/hello/startupz":{"httpGet":{"port":3333}},"/app-health/world/livez":{"httpGet":{"port":90}},"/app-health/world/startupz":{"httpGet":{"port":90}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -198,6 +199,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/app_probe/two_container.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/two_container.yaml.injected
@@ -95,7 +95,7 @@ spec:
               fieldPath: metadata.labels['service.istio.io/canonical-revision']
         - name: PROXY_CONFIG
           value: |
-            {}
+            {"proxyMetadata":{"DNS_AGENT":""}}
         - name: ISTIO_META_POD_PORTS
           value: |-
             [
@@ -118,6 +118,7 @@ spec:
           value: kubernetes://apis/apps/v1/namespaces/default/deployments/hello
         - name: ISTIO_META_MESH_ID
           value: cluster.local
+        - name: DNS_AGENT
         - name: ISTIO_KUBE_APP_PROBERS
           value: '{"/app-health/hello/readyz":{"httpGet":{"path":"/ip","port":8000}},"/app-health/world/readyz":{"httpGet":{"path":"/ipv6","port":9000}}}'
         image: gcr.io/istio-testing/proxyv2:latest
@@ -181,6 +182,8 @@ spec:
         - '*'
         - -d
         - 15090,15021,15020
+        env:
+        - name: DNS_AGENT
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init