Merge pull request #32 from openshift-service-mesh-bot/none-main-merg…

…e_upstream_main-38a843ce Automator: merge upstream changes to openshift-service-mesh/sail-operator@main
openshift-service-mesh · May 15, 2024 · 8f281e1 · 8f281e1
2 parents 6547585 + cad3f32
commit 8f281e1
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 21 deletions.
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-05-14T21:06:02Z"
+    createdAt: "2024-05-15T00:06:30Z"
     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
@@ -18,7 +18,7 @@ csv:
 
     - v1.21.2
     - v1.21.0
-    - latest (76d03ee7)
+    - latest (b593318e)
 
     [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/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
-appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638
+appVersion: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
 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.76d03ee78276eef8ca8068698e7e2106f31a3638
+version: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
diff --git a/resources/latest/charts/base/files/profile-compatibility-version-1.22.yaml b/resources/latest/charts/base/files/profile-compatibility-version-1.22.yaml
@@ -0,0 +1,9 @@
+# WARNING: DO NOT EDIT, THIS FILE IS A COPY.
+# The original version of this file is located at /manifests/helm-profiles directory.
+# If you want to make a change in this file, edit the original one and run "make gen".
+
+meshConfig:
+  # 1.22 behavioral changes
+  defaultConfig:
+    proxyMetadata:
+      ENABLE_DEFERRED_CLUSTER_CREATION: "false"
diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638
+appVersion: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
 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.76d03ee78276eef8ca8068698e7e2106f31a3638
+version: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
diff --git a/resources/latest/charts/cni/files/profile-compatibility-version-1.22.yaml b/resources/latest/charts/cni/files/profile-compatibility-version-1.22.yaml
@@ -0,0 +1,9 @@
+# WARNING: DO NOT EDIT, THIS FILE IS A COPY.
+# The original version of this file is located at /manifests/helm-profiles directory.
+# If you want to make a change in this file, edit the original one and run "make gen".
+
+meshConfig:
+  # 1.22 behavioral changes
+  defaultConfig:
+    proxyMetadata:
+      ENABLE_DEFERRED_CLUSTER_CREATION: "false"
diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml
@@ -112,7 +112,7 @@ defaults:
     hub: gcr.io/istio-testing
 
     # Default tag for Istio images.
-    tag: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638
+    tag: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
 
     # 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.76d03ee78276eef8ca8068698e7e2106f31a3638
+appVersion: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
 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.76d03ee78276eef8ca8068698e7e2106f31a3638
+version: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
diff --git a/resources/latest/charts/gateway/files/profile-compatibility-version-1.22.yaml b/resources/latest/charts/gateway/files/profile-compatibility-version-1.22.yaml
@@ -0,0 +1,9 @@
+# WARNING: DO NOT EDIT, THIS FILE IS A COPY.
+# The original version of this file is located at /manifests/helm-profiles directory.
+# If you want to make a change in this file, edit the original one and run "make gen".
+
+meshConfig:
+  # 1.22 behavioral changes
+  defaultConfig:
+    proxyMetadata:
+      ENABLE_DEFERRED_CLUSTER_CREATION: "false"
diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638
+appVersion: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
 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.76d03ee78276eef8ca8068698e7e2106f31a3638
+version: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
diff --git a/resources/latest/charts/istiod/files/profile-compatibility-version-1.22.yaml b/resources/latest/charts/istiod/files/profile-compatibility-version-1.22.yaml
@@ -0,0 +1,9 @@
+# WARNING: DO NOT EDIT, THIS FILE IS A COPY.
+# The original version of this file is located at /manifests/helm-profiles directory.
+# If you want to make a change in this file, edit the original one and run "make gen".
+
+meshConfig:
+  # 1.22 behavioral changes
+  defaultConfig:
+    proxyMetadata:
+      ENABLE_DEFERRED_CLUSTER_CREATION: "false"
diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml
@@ -234,7 +234,7 @@ defaults:
     # Dev builds from prow are on gcr.io
     hub: gcr.io/istio-testing
     # Default tag for Istio images.
-    tag: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638
+    tag: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
     # 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: v1
-appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638
+appVersion: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
 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.76d03ee78276eef8ca8068698e7e2106f31a3638
+version: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
diff --git a/resources/latest/charts/ztunnel/files/profile-compatibility-version-1.22.yaml b/resources/latest/charts/ztunnel/files/profile-compatibility-version-1.22.yaml
@@ -0,0 +1,9 @@
+# WARNING: DO NOT EDIT, THIS FILE IS A COPY.
+# The original version of this file is located at /manifests/helm-profiles directory.
+# If you want to make a change in this file, edit the original one and run "make gen".
+
+meshConfig:
+  # 1.22 behavioral changes
+  defaultConfig:
+    proxyMetadata:
+      ENABLE_DEFERRED_CLUSTER_CREATION: "false"
diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml
@@ -2,7 +2,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.76d03ee78276eef8ca8068698e7e2106f31a3638
+  tag: 1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38
   # 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
@@ -34,10 +34,10 @@ versions:
     version: 1.23-alpha
     repo: https://github.com/istio/istio
     branch: master
-    commit: 76d03ee78276eef8ca8068698e7e2106f31a3638
+    commit: b593318e2a5e776a6fef9e07f2b08d7913ea6a38
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/base-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/cni-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/gateway-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/istiod-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/ztunnel-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38/helm/base-1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38/helm/cni-1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38/helm/gateway-1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38/helm/istiod-1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38/helm/ztunnel-1.23-alpha.b593318e2a5e776a6fef9e07f2b08d7913ea6a38.tgz