Merge pull request #72 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 · Jul 2, 2024 · 3649761 · 3649761
2 parents 5925531 + ac053c4
commit 3649761
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 25 deletions.
diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -412,7 +412,7 @@ OPM ?= $(LOCALBIN)/opm
 OPERATOR_SDK_VERSION ?= v1.35.0
 HELM_VERSION ?= v3.15.2
 CONTROLLER_TOOLS_VERSION ?= v0.15.0
-OPM_VERSION ?= v1.43.1
+OPM_VERSION ?= v1.44.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-01T15:05:08Z"
+    createdAt: "2024-07-02T00:13:43Z"
     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
@@ -23,7 +23,7 @@ csv:
     - v1.21.3
     - v1.21.2
     - v1.21.0
-    - latest (cef4ca15)
+    - latest (3bc82d83)
 
     [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/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.15.1
 	istio.io/client-go v1.22.0-alpha.1.0.20240628002726-154dca4cbde3
-	istio.io/istio v0.0.0-20240628191254-cef4ca15fdb0
+	istio.io/istio v0.0.0-20240701200849-3bc82d831f72
 	k8s.io/api v0.30.1
 	k8s.io/apiextensions-apiserver v0.30.1
 	k8s.io/apimachinery v0.30.1

diff --git a/go.sum b/go.sum
@@ -495,8 +495,8 @@ istio.io/api v1.22.0-alpha.1.0.20240628002226-74890bf7da5e h1:dTpB6hS83KYxX4WqFj
 istio.io/api v1.22.0-alpha.1.0.20240628002226-74890bf7da5e/go.mod h1:THZA8sI/o2TXhmTM3P2EejCuE8VtWdMdrDQMD9FbdoU=
 istio.io/client-go v1.22.0-alpha.1.0.20240628002726-154dca4cbde3 h1:TkrleoSwb1NQ/0VYJk7yR5rZYnJ4kHxyDOWAJUneTcw=
 istio.io/client-go v1.22.0-alpha.1.0.20240628002726-154dca4cbde3/go.mod h1:Mxw+NyMaiY6h0LrYucNmTFVcJEEvY9H/Wag8LUdH8gE=
-istio.io/istio v0.0.0-20240628191254-cef4ca15fdb0 h1:DLwuw/aGLDg0QtVjI2QxNc8u9NoKice3qjzQILjfzek=
-istio.io/istio v0.0.0-20240628191254-cef4ca15fdb0/go.mod h1:d3kRp0sD45vg8pj0f2pysErOPW3OBSkhF4Ok7GO5Sdk=
+istio.io/istio v0.0.0-20240701200849-3bc82d831f72 h1:1V9KFl3MTb8yOn3wZAQXoH9AJq+ICQ10zaaOAejPtjI=
+istio.io/istio v0.0.0-20240701200849-3bc82d831f72/go.mod h1:x8CukJ3beoRqWZBmr9UUNdAMFwNUg4roF0045oClfDI=
 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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
 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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+version: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
 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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+version: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+    tag: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
 
     # 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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
 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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+version: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
 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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+version: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml
@@ -242,7 +242,7 @@ defaults:
     # Dev builds from prow are on gcr.io
     hub: gcr.io/istio-testing
     # Default tag for Istio images.
-    tag: 1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+    tag: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
     # 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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
 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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+version: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
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.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+  tag: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9
   # 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
@@ -84,10 +84,10 @@ versions:
     version: 1.23-alpha
     repo: https://github.com/istio/istio
     branch: master
-    commit: cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7
+    commit: 3bc82d831f7260991cd4c16d34c8fc28092c81b9
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7/helm/base-1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7/helm/cni-1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7/helm/gateway-1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7/helm/istiod-1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7/helm/ztunnel-1.23-alpha.cef4ca15fdb0bc8f3ba4e43278533cbea3c892c7.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/base-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/cni-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/gateway-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/istiod-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/ztunnel-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz