Merge pull request istio-ecosystem#91 from openshift-service-mesh-bot…

…/none-main-merge_upstream_main-38a843ce Automator: merge upstream changes to openshift-service-mesh/sail-operator@main
dgn · Jul 18, 2024 · cdb3b8f · cdb3b8f
2 parents 5bbd234 + 914fce8
commit cdb3b8f
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 44 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:master-3a1982fd09c72f345f85d394d5cce906b5484b76",
+  "image": "gcr.io/istio-testing/build-tools:master-9751f0d4c3808a14b81505d71bafc19e6959f0d8",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -420,7 +420,7 @@ OPM ?= $(LOCALBIN)/opm
 OPERATOR_SDK_VERSION ?= v1.35.0
 HELM_VERSION ?= v3.15.3
 CONTROLLER_TOOLS_VERSION ?= v0.15.0
-OPM_VERSION ?= v1.44.0
+OPM_VERSION ?= v1.45.0
 GITLEAKS_VERSION ?= v8.18.4
 
 .PHONY: helm $(HELM)

diff --git a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
@@ -34,7 +34,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: OpenShift Optional, Integration & Delivery, Networking, Security
     containerImage: quay.io/maistra-dev/sail-operator:3.0.0-tp-latest
-    createdAt: "2024-07-17T15:05:48Z"
+    createdAt: "2024-07-18T00:20:55Z"
     description: The OpenShift Service Mesh Operator enables you to install, configure,
       and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service
       Mesh is based on the open source Istio project.

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -25,7 +25,7 @@ csv:
     - v1.21.3
     - v1.21.2
     - v1.21.0
-    - latest (b5122951)
+    - latest (9398452e)
 
     [See this page](https://github.com/istio-ecosystem/sail-operator/blob/pre-main/bundle/README.md) for instructions on how to use it.
   support: Community based

diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
@@ -1 +1 @@
-cbe0f69e442f6d1d19c702d931b39048abd833c2
+46bb6b69ee600536ba5bce2fe9c9d64dc4165ac3
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
@@ -75,7 +75,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-3a1982fd09c72f345f85d394d5cce906b5484b76
+  IMAGE_VERSION=master-9751f0d4c3808a14b81505d71bafc19e6959f0d8
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools

diff --git a/go.mod b/go.mod
@@ -18,8 +18,8 @@ require (
 	gomodules.xyz/jsonpatch/v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.15.1
-	istio.io/client-go v1.23.0-alpha.0.0.20240715152414-e440a479f1ad
-	istio.io/istio v0.0.0-20240716192916-b5122951ad2e
+	istio.io/client-go v1.23.0-alpha.0.0.20240717200917-990731b83cc8
+	istio.io/istio v0.0.0-20240717215416-9398452ec000
 	k8s.io/api v0.30.1
 	k8s.io/apiextensions-apiserver v0.30.1
 	k8s.io/apimachinery v0.30.1
@@ -152,7 +152,7 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gotest.tools/v3 v3.5.1 // indirect
-	istio.io/api v1.23.0-alpha.0.0.20240715152114-ba230b0feaa6 // indirect
+	istio.io/api v1.23.0-alpha.0.0.20240717200518-ef9163fb1200 // indirect
 	k8s.io/apiserver v0.30.1 // indirect
 	k8s.io/component-base v0.30.1 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect

diff --git a/go.sum b/go.sum
@@ -491,12 +491,12 @@ gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
 gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
 helm.sh/helm/v3 v3.15.1 h1:22ztacHz4gMqhXNqCQ9NAg6BFWoRUryNLvnkz6OVyw0=
 helm.sh/helm/v3 v3.15.1/go.mod h1:fvfoRcB8UKRUV5jrIfOTaN/pG1TPhuqSb56fjYdTKXg=
-istio.io/api v1.23.0-alpha.0.0.20240715152114-ba230b0feaa6 h1:LE7o7iquUZem06fioArWLlqBM3d7rUtcIGf2GL6jdRI=
-istio.io/api v1.23.0-alpha.0.0.20240715152114-ba230b0feaa6/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM=
-istio.io/client-go v1.23.0-alpha.0.0.20240715152414-e440a479f1ad h1:nUBc+HA51JBn9GxQRSUXfTE77gkyLuNnhqfX4dmD1ig=
-istio.io/client-go v1.23.0-alpha.0.0.20240715152414-e440a479f1ad/go.mod h1:QAOl9Ze/PzW0m3xJKELlwtWWUDVgmRTPKGJV0BMVhuk=
-istio.io/istio v0.0.0-20240716192916-b5122951ad2e h1:3WdGM0VT6U6YwM3w2v7GTW0i0mL9gMSXBlJWbYmJ+m8=
-istio.io/istio v0.0.0-20240716192916-b5122951ad2e/go.mod h1:6gijZhB4Vt9wkm2o6fdF4pHrV0PzCsicVBWqcCzaRUs=
+istio.io/api v1.23.0-alpha.0.0.20240717200518-ef9163fb1200 h1:EgZkWIhuii2cF/KIeolDfnHx537jwoWwXzxeOF31nX8=
+istio.io/api v1.23.0-alpha.0.0.20240717200518-ef9163fb1200/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM=
+istio.io/client-go v1.23.0-alpha.0.0.20240717200917-990731b83cc8 h1:xNPDT1jT8EWe4XDIw1jBYigAhr2b2NHQ/4rwdy+yfvY=
+istio.io/client-go v1.23.0-alpha.0.0.20240717200917-990731b83cc8/go.mod h1:yxh3oGLR8ZGd6MUjEXK9d7aqWoMrlpptmf+yaXawS08=
+istio.io/istio v0.0.0-20240717215416-9398452ec000 h1:LnnoOwRAsmSgRpDZAZkVVoDO/9dI7RWHU3bKXpjLPwE=
+istio.io/istio v0.0.0-20240717215416-9398452ec000/go.mod h1:WGQNsotAwcUhADPZdEvbnlm09xUE5dM6yFbg1OHvOew=
 k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=
 k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
 k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=

diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+appVersion: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
 description: Helm chart for deploying Istio cluster resources and CRDs
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
 - istio
 name: base
 sources:
 - https://github.com/istio/istio
-version: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+version: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
diff --git a/resources/latest/charts/base/files/profile-compatibility-version-1.21.yaml b/resources/latest/charts/base/files/profile-compatibility-version-1.21.yaml
@@ -13,9 +13,9 @@ pilot:
 
 meshConfig:
   # 1.22 behavioral changes
-  proxyMetadata:
-    ISTIO_DELTA_XDS: "false"
   defaultConfig:
+    proxyMetadata:
+      ISTIO_DELTA_XDS: "false"
     tracing:
       zipkin:
         address: zipkin.istio-system:9411
diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+appVersion: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
 description: Helm chart for istio-cni components
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@@ -8,4 +8,4 @@ keywords:
 name: cni
 sources:
 - https://github.com/istio/istio
-version: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+version: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
diff --git a/resources/latest/charts/cni/files/profile-compatibility-version-1.21.yaml b/resources/latest/charts/cni/files/profile-compatibility-version-1.21.yaml
@@ -13,9 +13,9 @@ pilot:
 
 meshConfig:
   # 1.22 behavioral changes
-  proxyMetadata:
-    ISTIO_DELTA_XDS: "false"
   defaultConfig:
+    proxyMetadata:
+      ISTIO_DELTA_XDS: "false"
     tracing:
       zipkin:
         address: zipkin.istio-system:9411
diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml
@@ -113,7 +113,7 @@ defaults:
     hub: gcr.io/istio-testing
 
     # Default tag for Istio images.
-    tag: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+    tag: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
 
     # Variant of the image to use.
     # Currently supported are: [debug, distroless]

diff --git a/resources/latest/charts/gateway/Chart.yaml b/resources/latest/charts/gateway/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+appVersion: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
 description: Helm chart for deploying Istio gateways
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@@ -9,4 +9,4 @@ name: gateway
 sources:
 - https://github.com/istio/istio
 type: application
-version: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+version: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
diff --git a/resources/latest/charts/gateway/files/profile-compatibility-version-1.21.yaml b/resources/latest/charts/gateway/files/profile-compatibility-version-1.21.yaml
@@ -13,9 +13,9 @@ pilot:
 
 meshConfig:
   # 1.22 behavioral changes
-  proxyMetadata:
-    ISTIO_DELTA_XDS: "false"
   defaultConfig:
+    proxyMetadata:
+      ISTIO_DELTA_XDS: "false"
     tracing:
       zipkin:
         address: zipkin.istio-system:9411
diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+appVersion: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
 description: Helm chart for istio control plane
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@@ -9,4 +9,4 @@ keywords:
 name: istiod
 sources:
 - https://github.com/istio/istio
-version: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+version: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
diff --git a/resources/latest/charts/istiod/files/profile-compatibility-version-1.21.yaml b/resources/latest/charts/istiod/files/profile-compatibility-version-1.21.yaml
@@ -13,9 +13,9 @@ pilot:
 
 meshConfig:
   # 1.22 behavioral changes
-  proxyMetadata:
-    ISTIO_DELTA_XDS: "false"
   defaultConfig:
+    proxyMetadata:
+      ISTIO_DELTA_XDS: "false"
     tracing:
       zipkin:
         address: zipkin.istio-system:9411
diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml
@@ -238,7 +238,7 @@ defaults:
     # Dev builds from prow are on gcr.io
     hub: gcr.io/istio-testing
     # Default tag for Istio images.
-    tag: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+    tag: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
     # Variant of the image to use.
     # Currently supported are: [debug, distroless]
     variant: ""

diff --git a/resources/latest/charts/ztunnel/Chart.yaml b/resources/latest/charts/ztunnel/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+appVersion: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
 description: Helm chart for istio ztunnel components
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@@ -8,4 +8,4 @@ keywords:
 name: ztunnel
 sources:
 - https://github.com/istio/istio
-version: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+version: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
diff --git a/resources/latest/charts/ztunnel/files/profile-compatibility-version-1.21.yaml b/resources/latest/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
@@ -13,9 +13,9 @@ pilot:
 
 meshConfig:
   # 1.22 behavioral changes
-  proxyMetadata:
-    ISTIO_DELTA_XDS: "false"
   defaultConfig:
+    proxyMetadata:
+      ISTIO_DELTA_XDS: "false"
     tracing:
       zipkin:
         address: zipkin.istio-system:9411
diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml
@@ -4,7 +4,7 @@ defaults:
   # Hub to pull from. Image will be `Hub/Image:Tag-Variant`
   hub: gcr.io/istio-testing
   # Tag to pull from. Image will be `Hub/Image:Tag-Variant`
-  tag: 1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+  tag: 1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af
   # Variant to pull. Options are "debug" or "distroless". Unset will use the default for the given version.
   variant: ""
 

diff --git a/versions.yaml b/versions.yaml
@@ -104,10 +104,10 @@ versions:
     version: 1.23-alpha
     repo: https://github.com/istio/istio
     branch: master
-    commit: b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62
+    commit: 9398452ec0008897db8ed401034d4c472224f4af
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62/helm/base-1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62/helm/cni-1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62/helm/gateway-1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62/helm/istiod-1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62/helm/ztunnel-1.23-alpha.b5122951ad2ebbc2f0ddea09b21ef88dffbd9e62.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af/helm/base-1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af/helm/cni-1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af/helm/gateway-1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af/helm/istiod-1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af/helm/ztunnel-1.23-alpha.9398452ec0008897db8ed401034d4c472224f4af.tgz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		cbe0f69e442f6d1d19c702d931b39048abd833c2
		46bb6b69ee600536ba5bce2fe9c9d64dc4165ac3