Enable cleanup by default

istio · May 16, 2024 · 167a40e · 167a40e
1 parent e1a4e98
commit 167a40e
Show file tree

Hide file tree

Showing 108 changed files with 88 additions and 221 deletions.
diff --git a/manifests/charts/istio-control/istio-discovery/files/injection-template.yaml b/manifests/charts/istio-control/istio-discovery/files/injection-template.yaml
@@ -125,8 +125,6 @@ spec:
     {{ if or .Values.pilot.cni.enabled .Values.istio_cni.enabled -}}
     - "--run-validation"
     - "--skip-rule-apply"
-    {{ else }}
-    - "--preemptive-cleanup"
     {{ end -}}
     {{with .Values.global.imagePullPolicy }}imagePullPolicy: "{{.}}"{{end}}
   {{- if .ProxyConfig.ProxyMetadata }}

diff --git a/manifests/charts/istiod-remote/files/injection-template.yaml b/manifests/charts/istiod-remote/files/injection-template.yaml
@@ -125,8 +125,6 @@ spec:
     {{ if or .Values.pilot.cni.enabled .Values.istio_cni.enabled -}}
     - "--run-validation"
     - "--skip-rule-apply"
-    {{ else }}
-    - "--preemptive-cleanup"
     {{ end -}}
     {{with .Values.global.imagePullPolicy }}imagePullPolicy: "{{.}}"{{end}}
   {{- if .ProxyConfig.ProxyMetadata }}

diff --git a/pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected b/pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/auth.yaml.injected b/pkg/kube/inject/testdata/inject/auth.yaml.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/cronjob.yaml.injected b/pkg/kube/inject/testdata/inject/cronjob.yaml.injected
@@ -179,7 +179,6 @@ spec:
             - -d
             - 15090,15021,15020
             - --log_output_level=default:info
-            - --preemptive-cleanup
             image: gcr.io/istio-testing/proxyv2:latest
             name: istio-init
             resources:

diff --git a/pkg/kube/inject/testdata/inject/daemonset.yaml.injected b/pkg/kube/inject/testdata/inject/daemonset.yaml.injected
@@ -183,7 +183,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected b/pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected
@@ -198,7 +198,6 @@ items:
           - -d
           - 15090,15021,15020
           - --log_output_level=default:info
-          - --preemptive-cleanup
           image: gcr.io/istio-testing/proxyv2:latest
           name: istio-init
           resources:

diff --git a/pkg/kube/inject/testdata/inject/deploymentconfig-with-canonical-service-label.yaml.injected b/pkg/kube/inject/testdata/inject/deploymentconfig-with-canonical-service-label.yaml.injected
@@ -183,7 +183,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/deploymentconfig.yaml.injected b/pkg/kube/inject/testdata/inject/deploymentconfig.yaml.injected
@@ -183,7 +183,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/enable-core-dump-annotation.yaml.injected b/pkg/kube/inject/testdata/inject/enable-core-dump-annotation.yaml.injected
@@ -186,7 +186,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/enable-core-dump.yaml.injected b/pkg/kube/inject/testdata/inject/enable-core-dump.yaml.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/explicit-security-context.yaml.injected b/pkg/kube/inject/testdata/inject/explicit-security-context.yaml.injected
@@ -176,7 +176,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/format-duration.yaml.injected b/pkg/kube/inject/testdata/inject/format-duration.yaml.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/frontend.yaml.injected b/pkg/kube/inject/testdata/inject/frontend.yaml.injected
@@ -202,7 +202,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-always.yaml.injected b/pkg/kube/inject/testdata/inject/hello-always.yaml.injected
@@ -186,7 +186,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Always
         name: istio-init

diff --git a/pkg/kube/inject/testdata/inject/hello-image-pull-secret.yaml.injected b/pkg/kube/inject/testdata/inject/hello-image-pull-secret.yaml.injected
@@ -187,7 +187,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-image-secrets-in-values.yaml.injected b/pkg/kube/inject/testdata/inject/hello-image-secrets-in-values.yaml.injected
@@ -187,7 +187,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-mount-mtls-certs.yaml.injected b/pkg/kube/inject/testdata/inject/hello-mount-mtls-certs.yaml.injected
@@ -188,7 +188,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-mtls-not-ready.yaml.injected b/pkg/kube/inject/testdata/inject/hello-mtls-not-ready.yaml.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-multi.yaml.injected b/pkg/kube/inject/testdata/inject/hello-multi.yaml.injected
@@ -187,7 +187,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:
@@ -429,7 +428,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-multiple-image-secrets.yaml.injected b/pkg/kube/inject/testdata/inject/hello-multiple-image-secrets.yaml.injected
@@ -188,7 +188,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-namespace.yaml.injected b/pkg/kube/inject/testdata/inject/hello-namespace.yaml.injected
@@ -186,7 +186,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-never.yaml.injected b/pkg/kube/inject/testdata/inject/hello-never.yaml.injected
@@ -186,7 +186,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         imagePullPolicy: Never
         name: istio-init

diff --git a/...kube/inject/testdata/inject/hello-probes-noProxyHoldApplication-ProxyConfig.yaml.injected b/...kube/inject/testdata/inject/hello-probes-noProxyHoldApplication-ProxyConfig.yaml.injected
@@ -218,7 +218,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-probes-proxyHoldApplication-ProxyConfig.yaml.injected b/pkg/kube/inject/testdata/inject/hello-probes-proxyHoldApplication-ProxyConfig.yaml.injected
@@ -218,7 +218,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-probes-with-flag-set-in-annotation.yaml.injected b/pkg/kube/inject/testdata/inject/hello-probes-with-flag-set-in-annotation.yaml.injected
@@ -212,7 +212,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-probes-with-flag-unset-in-annotation.yaml.injected b/pkg/kube/inject/testdata/inject/hello-probes-with-flag-unset-in-annotation.yaml.injected
@@ -207,7 +207,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-probes.proxyHoldsApplication.yaml.injected b/pkg/kube/inject/testdata/inject/hello-probes.proxyHoldsApplication.yaml.injected
@@ -217,7 +217,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-probes.yaml.injected b/pkg/kube/inject/testdata/inject/hello-probes.yaml.injected
@@ -211,7 +211,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-proxy-override.yaml.injected b/pkg/kube/inject/testdata/inject/hello-proxy-override.yaml.injected
@@ -186,7 +186,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: docker.io/istio/proxy2_debug:unittest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-readiness.yaml.injected b/pkg/kube/inject/testdata/inject/hello-readiness.yaml.injected
@@ -191,7 +191,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-template-in-values.yaml.injected b/pkg/kube/inject/testdata/inject/hello-template-in-values.yaml.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-tproxy.yaml.injected b/pkg/kube/inject/testdata/inject/hello-tproxy.yaml.injected
@@ -187,7 +187,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello-tracing-disabled.yaml.injected b/pkg/kube/inject/testdata/inject/hello-tracing-disabled.yaml.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello.proxyHoldsApplication.yaml.injected b/pkg/kube/inject/testdata/inject/hello.proxyHoldsApplication.yaml.injected
@@ -191,7 +191,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello.yaml.injected b/pkg/kube/inject/testdata/inject/hello.yaml.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/hello.yaml.proxyImageName.injected b/pkg/kube/inject/testdata/inject/hello.yaml.proxyImageName.injected
@@ -185,7 +185,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyTest:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/https-probes.yaml.injected b/pkg/kube/inject/testdata/inject/https-probes.yaml.injected
@@ -212,7 +212,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/job.yaml.injected b/pkg/kube/inject/testdata/inject/job.yaml.injected
@@ -177,7 +177,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected b/pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected
@@ -189,7 +189,6 @@ spec:
         - -k
         - net1
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected b/pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected
@@ -188,7 +188,6 @@ spec:
         - -k
         - net1,net2
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/list-frontend.yaml.injected b/pkg/kube/inject/testdata/inject/list-frontend.yaml.injected
@@ -203,7 +203,6 @@ items:
           - -d
           - 15090,15021,15020
           - --log_output_level=default:info
-          - --preemptive-cleanup
           image: gcr.io/istio-testing/proxyv2:latest
           name: istio-init
           resources:

diff --git a/pkg/kube/inject/testdata/inject/list.yaml.injected b/pkg/kube/inject/testdata/inject/list.yaml.injected
@@ -189,7 +189,6 @@ items:
           - -d
           - 15090,15021,15020
           - --log_output_level=default:info
-          - --preemptive-cleanup
           image: gcr.io/istio-testing/proxyv2:latest
           name: istio-init
           resources:
@@ -430,7 +429,6 @@ items:
           - -d
           - 15090,15021,15020
           - --log_output_level=default:info
-          - --preemptive-cleanup
           image: gcr.io/istio-testing/proxyv2:latest
           name: istio-init
           resources:

diff --git a/pkg/kube/inject/testdata/inject/merge-probers.yaml.injected b/pkg/kube/inject/testdata/inject/merge-probers.yaml.injected
@@ -235,7 +235,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/multi-container.yaml.injected b/pkg/kube/inject/testdata/inject/multi-container.yaml.injected
@@ -187,7 +187,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/multi-init.yaml.injected b/pkg/kube/inject/testdata/inject/multi-init.yaml.injected
@@ -199,7 +199,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources:

diff --git a/pkg/kube/inject/testdata/inject/multiple-templates.yaml.injected b/pkg/kube/inject/testdata/inject/multiple-templates.yaml.injected
@@ -178,7 +178,6 @@ spec:
         - -d
         - 15090,15021,15020
         - --log_output_level=default:info
-        - --preemptive-cleanup
         image: gcr.io/istio-testing/proxyv2:latest
         name: istio-init
         resources: