From dbc16a4b903e2d9a9160f894cf1aef60f1072262 Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Tue, 24 Oct 2023 13:35:28 -0400 Subject: [PATCH] bump to latest istio patch release --- third_party/istio-latest/generate-manifests.sh | 2 +- third_party/istio-latest/istio-ci-mesh/istio.yaml | 14 ++++++-------- .../istio-latest/istio-ci-no-mesh/istio.yaml | 14 ++++++-------- .../istio-latest/istio-kind-no-mesh/istio.yaml | 14 ++++++-------- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/third_party/istio-latest/generate-manifests.sh b/third_party/istio-latest/generate-manifests.sh index 8e88bc2d47..d00f79c815 100755 --- a/third_party/istio-latest/generate-manifests.sh +++ b/third_party/istio-latest/generate-manifests.sh @@ -16,4 +16,4 @@ source "$(dirname $0)/../library.sh" -generate "1.17.1" "$(dirname $0)" +generate "1.17.8" "$(dirname $0)" diff --git a/third_party/istio-latest/istio-ci-mesh/istio.yaml b/third_party/istio-latest/istio-ci-mesh/istio.yaml index 5dba3baba7..f3727a4187 100644 --- a/third_party/istio-latest/istio-ci-mesh/istio.yaml +++ b/third_party/istio-latest/istio-ci-mesh/istio.yaml @@ -7812,7 +7812,7 @@ data: "sts": { "servicePort": 0 }, - "tag": "1.17.1", + "tag": "1.17.8", "tracer": { "datadog": { "address": "$(HOST_IP):8126" @@ -8016,7 +8016,6 @@ data: runAsUser: 1337 runAsNonRoot: true {{- end }} - restartPolicy: Always {{ end -}} {{- if eq (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} - name: enable-core-dump @@ -8206,7 +8205,6 @@ data: privileged: true readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} runAsGroup: 1337 - fsGroup: 1337 runAsNonRoot: false runAsUser: 0 {{- else }} @@ -8226,7 +8224,6 @@ data: privileged: {{ .Values.global.proxy.privileged }} readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} runAsGroup: 1337 - fsGroup: 1337 {{ if or (eq (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `TPROXY`) (eq (annotation .ObjectMeta `sidecar.istio.io/capNetBindService` .Values.global.proxy.capNetBindService) `true`) -}} runAsNonRoot: false runAsUser: 0 @@ -8382,7 +8379,7 @@ data: labels: service.istio.io/canonical-name: {{ index .ObjectMeta.Labels `service.istio.io/canonical-name` | default (index .ObjectMeta.Labels `app.kubernetes.io/name`) | default (index .ObjectMeta.Labels `app`) | default .DeploymentMeta.Name | quote }} service.istio.io/canonical-revision: {{ index .ObjectMeta.Labels `service.istio.io/canonical-revision` | default (index .ObjectMeta.Labels `app.kubernetes.io/version`) | default (index .ObjectMeta.Labels `version`) | default "latest" | quote }} - istio.io/rev: {{ .Revision | default "default" | quote }} + istio.io/rev: {{ index .ObjectMeta.Labels `istio.io/rev` | default .Revision | default "default" | quote }} annotations: { {{- if eq (len $containers) 1 }} kubectl.kubernetes.io/default-logs-container: "{{ index $containers 0 }}", @@ -8611,7 +8608,8 @@ data: {{- end }} grpc-simple: | metadata: - sidecar.istio.io/rewriteAppHTTPProbers: "false" + annotations: + sidecar.istio.io/rewriteAppHTTPProbers: "false" spec: initContainers: - name: grpc-bootstrap-init @@ -9102,7 +9100,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: docker.io/istio/proxyv2:1.17.1 + image: docker.io/istio/proxyv2:1.17.8 name: istio-proxy ports: - containerPort: 15021 @@ -9252,7 +9250,7 @@ spec: fsGroup: 1337 containers: - name: discovery - image: docker.io/istio/pilot:1.17.1 + image: docker.io/istio/pilot:1.17.8 args: - discovery - --monitoringAddr=:15014 diff --git a/third_party/istio-latest/istio-ci-no-mesh/istio.yaml b/third_party/istio-latest/istio-ci-no-mesh/istio.yaml index 15daa8bce3..d982827c94 100644 --- a/third_party/istio-latest/istio-ci-no-mesh/istio.yaml +++ b/third_party/istio-latest/istio-ci-no-mesh/istio.yaml @@ -7812,7 +7812,7 @@ data: "sts": { "servicePort": 0 }, - "tag": "1.17.1", + "tag": "1.17.8", "tracer": { "datadog": { "address": "$(HOST_IP):8126" @@ -8016,7 +8016,6 @@ data: runAsUser: 1337 runAsNonRoot: true {{- end }} - restartPolicy: Always {{ end -}} {{- if eq (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} - name: enable-core-dump @@ -8206,7 +8205,6 @@ data: privileged: true readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} runAsGroup: 1337 - fsGroup: 1337 runAsNonRoot: false runAsUser: 0 {{- else }} @@ -8226,7 +8224,6 @@ data: privileged: {{ .Values.global.proxy.privileged }} readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} runAsGroup: 1337 - fsGroup: 1337 {{ if or (eq (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `TPROXY`) (eq (annotation .ObjectMeta `sidecar.istio.io/capNetBindService` .Values.global.proxy.capNetBindService) `true`) -}} runAsNonRoot: false runAsUser: 0 @@ -8382,7 +8379,7 @@ data: labels: service.istio.io/canonical-name: {{ index .ObjectMeta.Labels `service.istio.io/canonical-name` | default (index .ObjectMeta.Labels `app.kubernetes.io/name`) | default (index .ObjectMeta.Labels `app`) | default .DeploymentMeta.Name | quote }} service.istio.io/canonical-revision: {{ index .ObjectMeta.Labels `service.istio.io/canonical-revision` | default (index .ObjectMeta.Labels `app.kubernetes.io/version`) | default (index .ObjectMeta.Labels `version`) | default "latest" | quote }} - istio.io/rev: {{ .Revision | default "default" | quote }} + istio.io/rev: {{ index .ObjectMeta.Labels `istio.io/rev` | default .Revision | default "default" | quote }} annotations: { {{- if eq (len $containers) 1 }} kubectl.kubernetes.io/default-logs-container: "{{ index $containers 0 }}", @@ -8611,7 +8608,8 @@ data: {{- end }} grpc-simple: | metadata: - sidecar.istio.io/rewriteAppHTTPProbers: "false" + annotations: + sidecar.istio.io/rewriteAppHTTPProbers: "false" spec: initContainers: - name: grpc-bootstrap-init @@ -9102,7 +9100,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: docker.io/istio/proxyv2:1.17.1 + image: docker.io/istio/proxyv2:1.17.8 name: istio-proxy ports: - containerPort: 15021 @@ -9252,7 +9250,7 @@ spec: fsGroup: 1337 containers: - name: discovery - image: docker.io/istio/pilot:1.17.1 + image: docker.io/istio/pilot:1.17.8 args: - discovery - --monitoringAddr=:15014 diff --git a/third_party/istio-latest/istio-kind-no-mesh/istio.yaml b/third_party/istio-latest/istio-kind-no-mesh/istio.yaml index 8d9049ee7c..8b50384c15 100644 --- a/third_party/istio-latest/istio-kind-no-mesh/istio.yaml +++ b/third_party/istio-latest/istio-kind-no-mesh/istio.yaml @@ -7812,7 +7812,7 @@ data: "sts": { "servicePort": 0 }, - "tag": "1.17.1", + "tag": "1.17.8", "tracer": { "datadog": { "address": "$(HOST_IP):8126" @@ -8016,7 +8016,6 @@ data: runAsUser: 1337 runAsNonRoot: true {{- end }} - restartPolicy: Always {{ end -}} {{- if eq (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} - name: enable-core-dump @@ -8206,7 +8205,6 @@ data: privileged: true readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} runAsGroup: 1337 - fsGroup: 1337 runAsNonRoot: false runAsUser: 0 {{- else }} @@ -8226,7 +8224,6 @@ data: privileged: {{ .Values.global.proxy.privileged }} readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} runAsGroup: 1337 - fsGroup: 1337 {{ if or (eq (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `TPROXY`) (eq (annotation .ObjectMeta `sidecar.istio.io/capNetBindService` .Values.global.proxy.capNetBindService) `true`) -}} runAsNonRoot: false runAsUser: 0 @@ -8382,7 +8379,7 @@ data: labels: service.istio.io/canonical-name: {{ index .ObjectMeta.Labels `service.istio.io/canonical-name` | default (index .ObjectMeta.Labels `app.kubernetes.io/name`) | default (index .ObjectMeta.Labels `app`) | default .DeploymentMeta.Name | quote }} service.istio.io/canonical-revision: {{ index .ObjectMeta.Labels `service.istio.io/canonical-revision` | default (index .ObjectMeta.Labels `app.kubernetes.io/version`) | default (index .ObjectMeta.Labels `version`) | default "latest" | quote }} - istio.io/rev: {{ .Revision | default "default" | quote }} + istio.io/rev: {{ index .ObjectMeta.Labels `istio.io/rev` | default .Revision | default "default" | quote }} annotations: { {{- if eq (len $containers) 1 }} kubectl.kubernetes.io/default-logs-container: "{{ index $containers 0 }}", @@ -8611,7 +8608,8 @@ data: {{- end }} grpc-simple: | metadata: - sidecar.istio.io/rewriteAppHTTPProbers: "false" + annotations: + sidecar.istio.io/rewriteAppHTTPProbers: "false" spec: initContainers: - name: grpc-bootstrap-init @@ -9102,7 +9100,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: docker.io/istio/proxyv2:1.17.1 + image: docker.io/istio/proxyv2:1.17.8 name: istio-proxy ports: - containerPort: 15021 @@ -9252,7 +9250,7 @@ spec: fsGroup: 1337 containers: - name: discovery - image: docker.io/istio/pilot:1.17.1 + image: docker.io/istio/pilot:1.17.8 args: - discovery - --monitoringAddr=:15014