Automated merge

* upstream/main: Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#200) # Conflicts: # bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-service-mesh · Jul 12, 2024 · 5bfcba0 · 5bfcba0
2 parents e88b7a9 + 3326118
commit 5bfcba0
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 24 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-07-11T00:16:33Z"
+    createdAt: "2024-07-12T06:10:50Z"
     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 (45c81210)
+    - latest (f573bd2b)
 
     [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.20240710165223-77a6a2312154
-	istio.io/istio v0.0.0-20240710200623-45c812104ae0
+	istio.io/istio v0.0.0-20240711203653-f573bd2b3446
 	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.20240710015323-7bf1eab280a7 h1:1xnIuciU3hEhbEEAsB
 istio.io/api v1.22.0-alpha.1.0.20240710015323-7bf1eab280a7/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM=
 istio.io/client-go v1.22.0-alpha.1.0.20240710165223-77a6a2312154 h1:RiYaMdKLW4C52F2jUJpDG5Wdh34BNOyBicZvDfnEMSM=
 istio.io/client-go v1.22.0-alpha.1.0.20240710165223-77a6a2312154/go.mod h1:cEJy6MQ/KMWKzjo7rqtIsusCYDEisIJQe6lyHAVB8+I=
-istio.io/istio v0.0.0-20240710200623-45c812104ae0 h1:PZZOy0Gi76yWOe6q6u4FwRbkoKcJ/zvKmpg9ueFA0fk=
-istio.io/istio v0.0.0-20240710200623-45c812104ae0/go.mod h1:I6rtK61iK5VI6xq9kF02dxaZqCA3ERd1oWE4wbL8zyA=
+istio.io/istio v0.0.0-20240711203653-f573bd2b3446 h1:No2brtuiwykffJ2Pa5im+GZVPaE2WJPUgvMLs9Llhwo=
+istio.io/istio v0.0.0-20240711203653-f573bd2b3446/go.mod h1:I6rtK61iK5VI6xq9kF02dxaZqCA3ERd1oWE4wbL8zyA=
 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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+appVersion: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
 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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+version: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+appVersion: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
 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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+version: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+    tag: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
 
     # 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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+appVersion: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
 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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+version: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+appVersion: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
 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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+version: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
diff --git a/resources/latest/charts/istiod/files/waypoint.yaml b/resources/latest/charts/istiod/files/waypoint.yaml
@@ -295,6 +295,7 @@ metadata:
     name: "{{.Name}}"
     uid: "{{.UID}}"
 spec:
+  ipFamilyPolicy: PreferDualStack
   ports:
   {{- range $key, $val := .Ports }}
   - name: {{ $val.Name | quote }}

diff --git a/resources/latest/charts/istiod/templates/clusterrole.yaml b/resources/latest/charts/istiod/templates/clusterrole.yaml
@@ -41,6 +41,10 @@ rules:
     verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ]
     resources: [ "workloadentries/status" ]
 
+  - apiGroups: ["networking.istio.io"]
+    verbs: [ "get", "watch", "list", "update", "patch" ]
+    resources: [ "serviceentries/status" ]
+
   # auto-detect installed CRD definitions
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]

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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+    tag: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
     # 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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+appVersion: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
 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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+version: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
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.45c812104ae0e7a0a9180607e796e27bbcd760fc
+  tag: 1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539
   # 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: 45c812104ae0e7a0a9180607e796e27bbcd760fc
+    commit: f573bd2b344686f0a8ca40470317ee9652b37539
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc/helm/base-1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc/helm/cni-1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc/helm/gateway-1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc/helm/istiod-1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc/helm/ztunnel-1.23-alpha.45c812104ae0e7a0a9180607e796e27bbcd760fc.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539/helm/base-1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539/helm/cni-1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539/helm/gateway-1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539/helm/istiod-1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539/helm/ztunnel-1.23-alpha.f573bd2b344686f0a8ca40470317ee9652b37539.tgz