Automator: Update dependencies in istio-ecosystem/sail-operator@main (#…

…424) Signed-off-by: openshift-service-mesh-bot <openshiftservicemeshbot@gmail.com>
istio-ecosystem · Oct 17, 2024 · dea3547 · dea3547
1 parent b10e7b7
commit dea3547
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 53 deletions.
diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml
@@ -34,7 +34,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: OpenShift Optional, Integration & Delivery, Networking, Security
     containerImage: quay.io/maistra-dev/sail-operator:0.2-latest
-    createdAt: "2024-10-16T05:05:08Z"
+    createdAt: "2024-10-17T05:05:02Z"
     description: Experimental operator for installing Istio service mesh
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "true"
@@ -375,7 +375,7 @@ spec:
     - v1.23.2
     - v1.22.5
     - v1.21.6
-    - latest (1d92787e)
+    - latest (0f6609f9)
 
     [See this page](https://github.com/istio-ecosystem/sail-operator/blob/main/bundle/README.md) for instructions on how to use it.
   displayName: Sail Operator
@@ -599,10 +599,10 @@ spec:
           template:
             metadata:
               annotations:
-                images.latest.cni: gcr.io/istio-testing/install-cni:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
-                images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
-                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
-                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+                images.latest.cni: gcr.io/istio-testing/install-cni:1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
+                images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
+                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
+                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
                 images.v1_21_6.cni: docker.io/istio/install-cni:1.21.6
                 images.v1_21_6.istiod: docker.io/istio/pilot:1.21.6
                 images.v1_21_6.proxy: docker.io/istio/proxyv2:1.21.6
@@ -768,13 +768,13 @@ spec:
   provider:
     name: Red Hat, Inc.
   relatedImages:
-  - image: gcr.io/istio-testing/install-cni:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+  - image: gcr.io/istio-testing/install-cni:1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
     name: latest.cni
-  - image: gcr.io/istio-testing/pilot:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+  - image: gcr.io/istio-testing/pilot:1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
     name: latest.istiod
-  - image: gcr.io/istio-testing/proxyv2:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+  - image: gcr.io/istio-testing/proxyv2:1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
     name: latest.proxy
-  - image: gcr.io/istio-testing/ztunnel:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+  - image: gcr.io/istio-testing/ztunnel:1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
     name: latest.ztunnel
   - image: docker.io/istio/install-cni:1.21.6
     name: v1_21_6.cni

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -21,7 +21,7 @@ csv:
     - v1.23.2
     - v1.22.5
     - v1.21.6
-    - latest (1d92787e)
+    - latest (0f6609f9)
 
     [See this page](https://github.com/istio-ecosystem/sail-operator/blob/main/bundle/README.md) for instructions on how to use it.
   support: Community based

diff --git a/go.mod b/go.mod
@@ -23,8 +23,8 @@ require (
 	gomodules.xyz/jsonpatch/v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.16.1
-	istio.io/client-go v1.23.0-alpha.0.0.20241016001849-29f61837a029
-	istio.io/istio v0.0.0-20241016035750-1d92787e64d8
+	istio.io/client-go v1.24.0-alpha.0.0.20241016001849-29f61837a029
+	istio.io/istio v0.0.0-20241016232351-0f6609f9b5cf
 	k8s.io/api v0.31.1
 	k8s.io/apiextensions-apiserver v0.31.1
 	k8s.io/apimachinery v0.31.1

diff --git a/go.sum b/go.sum
@@ -491,10 +491,10 @@ helm.sh/helm/v3 v3.16.1 h1:cER6tI/8PgUAsaJaQCVBUg3VI9KN4oVaZJgY60RIc0c=
 helm.sh/helm/v3 v3.16.1/go.mod h1:r+xBHHP20qJeEqtvBXMf7W35QDJnzY/eiEBzt+TfHps=
 istio.io/api v1.23.0-alpha.0.0.20241016001450-1e82bd43199b h1:M4Jl9GaT7FW0m4L8GRSip6M5hdUBZYXHyMFMGof0AIs=
 istio.io/api v1.23.0-alpha.0.0.20241016001450-1e82bd43199b/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
-istio.io/client-go v1.23.0-alpha.0.0.20241016001849-29f61837a029 h1:b8K9SSN06AfSMBKy37sS+/VFaUQCnDnHCOJBOXHwYKo=
-istio.io/client-go v1.23.0-alpha.0.0.20241016001849-29f61837a029/go.mod h1:EiGjBEP+sbj1M/xdkXX60aVsLmJunLQqMpl2YjmHgS4=
-istio.io/istio v0.0.0-20241016035750-1d92787e64d8 h1:v4NkEKghPMy/N32RVARizxMHfJNpQVSHc5Nmu76v4E0=
-istio.io/istio v0.0.0-20241016035750-1d92787e64d8/go.mod h1:OjXgkrdrI5myoxr0eDxoWm+q5kFrcgLNlJLRvGd5ZIk=
+istio.io/client-go v1.24.0-alpha.0.0.20241016001849-29f61837a029 h1:bcJPjAUZlNi7JCg6KAtsvoeOnTe+bxmOuxcwI3+dViI=
+istio.io/client-go v1.24.0-alpha.0.0.20241016001849-29f61837a029/go.mod h1:EiGjBEP+sbj1M/xdkXX60aVsLmJunLQqMpl2YjmHgS4=
+istio.io/istio v0.0.0-20241016232351-0f6609f9b5cf h1:iFsNha0D03fxkFhUqU5h6xaSPEQ6KqqOzVO8sMdeq7g=
+istio.io/istio v0.0.0-20241016232351-0f6609f9b5cf/go.mod h1:OjXgkrdrI5myoxr0eDxoWm+q5kFrcgLNlJLRvGd5ZIk=
 k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
 k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
 k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=

diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+appVersion: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
 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.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+version: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+appVersion: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
 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.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+version: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml
@@ -112,7 +112,7 @@ _internal_defaults_do_not_set:
     hub: gcr.io/istio-testing
 
     # Default tag for Istio images.
-    tag: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+    tag: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
 
     # 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.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+appVersion: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
 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.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+version: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+appVersion: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
 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.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+version: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
diff --git a/resources/latest/charts/istiod/templates/configmap.yaml b/resources/latest/charts/istiod/templates/configmap.yaml
@@ -65,11 +65,7 @@
       {{- end }}
       {{- end }}
       {{- if .Values.global.remotePilotAddress }}
-      {{- if .Values.enabled }}
-      discoveryAddress: {{ printf "istiod-remote.%s.svc" .Release.Namespace }}:15012
-      {{- else }}
       discoveryAddress: {{ printf "istiod.%s.svc" .Release.Namespace }}:15012
-      {{- end }}
       {{- else }}
       discoveryAddress: istiod{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}.{{.Release.Namespace}}.svc:15012
       {{- end }}

diff --git a/resources/latest/charts/istiod/templates/reader-clusterrole.yaml b/resources/latest/charts/istiod/templates/reader-clusterrole.yaml
@@ -49,7 +49,7 @@ rules:
   - apiGroups: ["authorization.k8s.io"]
     resources: ["subjectaccessreviews"]
     verbs: ["create"]
-{{- if .Values.global.externalIstiod }}
+{{- if .Values.istiodRemote.enabled }}
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["create", "get", "list", "watch", "update"]

diff --git a/resources/latest/charts/istiod/templates/remote-istiod-endpoints.yaml b/resources/latest/charts/istiod/templates/remote-istiod-endpoints.yaml
@@ -5,11 +5,7 @@
 apiVersion: v1
 kind: Endpoints
 metadata:
-  {{- if .Values.global.externalIstiod }}
   name: istiod{{- if .Values.revision }}-{{ .Values.revision}}{{- end }}
-  {{- else }}
-  name: istiod{{- if .Values.revision }}-{{ .Values.revision}}{{- end }}-remote
-  {{- end }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: "istiod"

diff --git a/resources/latest/charts/istiod/templates/remote-istiod-service.yaml b/resources/latest/charts/istiod/templates/remote-istiod-service.yaml
@@ -3,11 +3,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  {{- if .Values.global.externalIstiod }}
   name: istiod{{- if .Values.revision }}-{{ .Values.revision}}{{- end }}
-  {{- else }}
-  name: istiod{{- if .Values.revision }}-{{ .Values.revision}}{{- end }}-remote
-  {{- end }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: "istiod"

diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml
@@ -242,7 +242,7 @@ _internal_defaults_do_not_set:
     # Dev builds from prow are on gcr.io
     hub: gcr.io/istio-testing
     # Default tag for Istio images.
-    tag: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+    tag: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
     # Variant of the image to use.
     # Currently supported are: [debug, distroless]
     variant: ""
@@ -399,9 +399,7 @@ _internal_defaults_do_not_set:
     # If not set explicitly, default to the Istio discovery address.
     caAddress: ""
 
-    # Configure a remote cluster data plane controlled by an external istiod.
-    # When set to true, istiod is not deployed locally and only a subset of the other
-    # discovery charts are enabled.
+    # Enable control of remote clusters.
     externalIstiod: false
 
     # Configure a remote cluster as the config cluster for an external istiod.

diff --git a/resources/latest/charts/ztunnel/Chart.yaml b/resources/latest/charts/ztunnel/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+appVersion: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
 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.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+version: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml
@@ -4,7 +4,7 @@ _internal_defaults_do_not_set:
   # 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.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+  tag: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
   # 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
@@ -43,13 +43,13 @@ versions:
       - https://istio-release.storage.googleapis.com/charts/cni-1.21.6.tgz
       - https://istio-release.storage.googleapis.com/charts/ztunnel-1.21.6.tgz
   - name: latest
-    version: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070
+    version: 1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f
     repo: https://github.com/istio/istio
     branch: master
-    commit: 1d92787e64d8c46594e86ae9b5e90265384e5070
+    commit: 0f6609f9b5cfe8517fbb6b157dd226356f827a7f
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/base-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/cni-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/gateway-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/istiod-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/ztunnel-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f/helm/base-1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f/helm/cni-1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f/helm/gateway-1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f/helm/istiod-1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f/helm/ztunnel-1.24-alpha.0f6609f9b5cfe8517fbb6b157dd226356f827a7f.tgz