Remove customizations for skipped test

Signed-off-by: Kevin Dorosh <kevin.dorosh@solo.io>
istio · Jul 6, 2023 · bef3d72 · bef3d72
1 parent eb05c10
commit bef3d72
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 84 deletions.
diff --git a/pkg/test/framework/components/echo/cmd/echogen/testdata/golden.yaml b/pkg/test/framework/components/echo/cmd/echogen/testdata/golden.yaml
@@ -162,8 +162,4 @@ spec:
           failureThreshold: 10
           periodSeconds: 1
           tcpSocket:
-            port: tcp-health-port
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
+            port: tcp-health-port
diff --git a/pkg/test/framework/components/echo/kube/templates/deployment.yaml b/pkg/test/framework/components/echo/kube/templates/deployment.yaml
@@ -71,11 +71,6 @@ spec:
       imagePullSecrets:
       - name: {{ $.ImagePullSecretName }}
 {{- end }}
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
 {{- if and
   (ne ($subset.Annotations.GetByName "sidecar.istio.io/inject") "false")

diff --git a/pkg/test/framework/components/echo/kube/testdata/basic.yaml b/pkg/test/framework/components/echo/kube/testdata/basic.yaml
@@ -38,11 +38,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto

diff --git a/pkg/test/framework/components/echo/kube/testdata/disable-automount-sa.yaml b/pkg/test/framework/components/echo/kube/testdata/disable-automount-sa.yaml
@@ -45,11 +45,6 @@ spec:
       automountServiceAccountToken: false
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto

diff --git a/pkg/test/framework/components/echo/kube/testdata/healthcheck-rewrite.yaml b/pkg/test/framework/components/echo/kube/testdata/healthcheck-rewrite.yaml
@@ -39,11 +39,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto

diff --git a/pkg/test/framework/components/echo/kube/testdata/multiple-istio-versions-no-proxy.yaml b/pkg/test/framework/components/echo/kube/testdata/multiple-istio-versions-no-proxy.yaml
@@ -39,11 +39,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: app
         image: testing.hub/app:latest
@@ -119,11 +114,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: app
         image: testing.hub/app:latest

diff --git a/pkg/test/framework/components/echo/kube/testdata/multiple-istio-versions.yaml b/pkg/test/framework/components/echo/kube/testdata/multiple-istio-versions.yaml
@@ -39,11 +39,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto
@@ -124,11 +119,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto

diff --git a/pkg/test/framework/components/echo/kube/testdata/multiversion.yaml b/pkg/test/framework/components/echo/kube/testdata/multiversion.yaml
@@ -41,11 +41,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto
@@ -128,11 +123,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: app
         image: testing.hub/app:latest

diff --git a/pkg/test/framework/components/echo/kube/testdata/proxyless-custom-image.yaml b/pkg/test/framework/components/echo/kube/testdata/proxyless-custom-image.yaml
@@ -37,11 +37,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto

diff --git a/pkg/test/framework/components/echo/kube/testdata/proxyless.yaml b/pkg/test/framework/components/echo/kube/testdata/proxyless.yaml
@@ -37,11 +37,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto

diff --git a/pkg/test/framework/components/echo/kube/testdata/two-workloads-one-nosidecar.yaml b/pkg/test/framework/components/echo/kube/testdata/two-workloads-one-nosidecar.yaml
@@ -38,11 +38,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: istio-proxy
         image: auto
@@ -123,11 +118,6 @@ spec:
     spec:
       imagePullSecrets:
       - name: myregistrykey
-      # required for TestServiceEntryDNSWithAutoAssign test since golang DNS client in ForwardEcho pod does not honor ndots
-      dnsConfig:
-        options:
-        - name: ndots
-          value: "1"
       containers:
       - name: app
         image: testing.hub/app:latest

diff --git a/tests/integration/ambient/main_test.go b/tests/integration/ambient/main_test.go
@@ -76,18 +76,10 @@ components:
   - name: istio-ingressgateway
     enabled: true
 values:
-  ztunnel:
-    meshConfig:
-      defaultConfig:
-        proxyMetadata:
-          ISTIO_META_DNS_CAPTURE: "true"
-          ISTIO_META_DNS_AUTO_ALLOCATE: "true"
-          DNS_PROXY_ADDR: "0.0.0.0:15053"
   meshConfig:
     defaultConfig:
       proxyMetadata:
-        ISTIO_META_DNS_CAPTURE: "true"
-        ISTIO_META_DNS_AUTO_ALLOCATE: "true"
+        ISTIO_META_DNS_CAPTURE: "false"
         DNS_PROXY_ADDR: "0.0.0.0:15053"
     accessLogFile: /dev/stdout`