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

…435) Signed-off-by: openshift-service-mesh-bot <[email protected]>
istio-ecosystem · Oct 19, 2024 · 411faaf · 411faaf
1 parent 79dedbc
commit 411faaf
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 44 deletions.
diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -472,7 +472,7 @@ OPERATOR_SDK_VERSION ?= v1.37.0
 HELM_VERSION ?= v3.16.2
 CONTROLLER_TOOLS_VERSION ?= v0.16.4
 OPM_VERSION ?= v1.47.0
-GITLEAKS_VERSION ?= v8.21.0
+GITLEAKS_VERSION ?= v8.21.1
 ISTIOCTL_VERSION ?= 1.23.0
 
 # GENERATE_RELATED_IMAGES defines whether `spec.relatedImages` is going to be generated or not

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-18T10:03:26Z"
+    createdAt: "2024-10-19T05:04:49Z"
     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 (d643c2b4)
+    - latest (8aea55ef)
 
     [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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
-                images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
-                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
-                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+                images.latest.cni: gcr.io/istio-testing/install-cni:1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
+                images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
+                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
+                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
                 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
@@ -767,13 +767,13 @@ spec:
   provider:
     name: Red Hat, Inc.
   relatedImages:
-  - image: gcr.io/istio-testing/install-cni:1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+  - image: gcr.io/istio-testing/install-cni:1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
     name: latest.cni
-  - image: gcr.io/istio-testing/pilot:1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+  - image: gcr.io/istio-testing/pilot:1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
     name: latest.istiod
-  - image: gcr.io/istio-testing/proxyv2:1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+  - image: gcr.io/istio-testing/proxyv2:1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
     name: latest.proxy
-  - image: gcr.io/istio-testing/ztunnel:1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+  - image: gcr.io/istio-testing/ztunnel:1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
     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 (d643c2b4)
+    - latest (8aea55ef)
 
     [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.24.0-alpha.0.0.20241018025852-180069d05abc
-	istio.io/istio v0.0.0-20241018033452-d643c2b4db75
+	istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6
+	istio.io/istio v0.0.0-20241018205552-8aea55efd28f
 	k8s.io/api v0.31.1
 	k8s.io/apiextensions-apiserver v0.31.1
 	k8s.io/apimachinery v0.31.1
@@ -166,7 +166,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.24.0-alpha.0.0.20241018025552-585d68d196b9 // indirect
+	istio.io/api v1.24.0-alpha.0.0.20241018201654-7c8ec5b5ab72 // indirect
 	k8s.io/apiserver v0.31.1 // indirect
 	k8s.io/component-base v0.31.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect

diff --git a/go.sum b/go.sum
@@ -489,12 +489,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.16.1 h1:cER6tI/8PgUAsaJaQCVBUg3VI9KN4oVaZJgY60RIc0c=
 helm.sh/helm/v3 v3.16.1/go.mod h1:r+xBHHP20qJeEqtvBXMf7W35QDJnzY/eiEBzt+TfHps=
-istio.io/api v1.24.0-alpha.0.0.20241018025552-585d68d196b9 h1:EFUUIdICG1wgxrOSMBUWEwURHKYghAOQiJTXzP4+HZg=
-istio.io/api v1.24.0-alpha.0.0.20241018025552-585d68d196b9/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
-istio.io/client-go v1.24.0-alpha.0.0.20241018025852-180069d05abc h1:LOLYJ+f8W5jHAb28TAkS8ZdS3nHtC3agdtZPsBvrfOE=
-istio.io/client-go v1.24.0-alpha.0.0.20241018025852-180069d05abc/go.mod h1:5pDrNlMrcYsskO+ZJRN3ifFxPCAn25QWZrMpra4jYdY=
-istio.io/istio v0.0.0-20241018033452-d643c2b4db75 h1:m+5+a5FDhdGn9eFIG0iuxQtifhbyh58CptDoglXSyP8=
-istio.io/istio v0.0.0-20241018033452-d643c2b4db75/go.mod h1:XelRzQTT6H3ySG7OewDL9ZzfbzgdZmMoWiWf3XCTgQE=
+istio.io/api v1.24.0-alpha.0.0.20241018201654-7c8ec5b5ab72 h1:AVg/4p5sVhZT6JwBczgvAy9idbVYiCqZFE/QVXNKy/k=
+istio.io/api v1.24.0-alpha.0.0.20241018201654-7c8ec5b5ab72/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
+istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6 h1:qVjgBbqg19vZCpeTMQR0QM8SRfLZTtaSXgWbnWRb0fo=
+istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6/go.mod h1:usBQZ/vvpGAUA6yGiz6x9ufG50gRC9v0332MesA/lNw=
+istio.io/istio v0.0.0-20241018205552-8aea55efd28f h1:Zj7OU4nVmt0qYY70t8slC76eRIlVPTf5x3OURNMW4hE=
+istio.io/istio v0.0.0-20241018205552-8aea55efd28f/go.mod h1:HIYMYxUxROUbBMwgNfV6QmZmVBn2soLee2eigSAMCbM=
 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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+appVersion: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
 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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+version: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+appVersion: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
 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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+version: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
diff --git a/resources/latest/charts/cni/templates/daemonset.yaml b/resources/latest/charts/cni/templates/daemonset.yaml
@@ -112,8 +112,10 @@ spec:
               # namespaces. There does not appear to be a more granular capability for this.
               - SYS_ADMIN
 {{- if .Values.seLinuxOptions }}
+{{ with (merge .Values.seLinuxOptions (dict "type" "spc_t")) }}
             seLinuxOptions:
-{{ toYaml .Values.seLinuxOptions | trim | indent 14 }}
+{{ toYaml . | trim | indent 14 }}
+{{- end }}
 {{- end }}
 {{- if .Values.seccompProfile }}
             seccompProfile:

diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml
@@ -115,7 +115,7 @@ _internal_defaults_do_not_set:
     hub: gcr.io/istio-testing
 
     # Default tag for Istio images.
-    tag: 1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+    tag: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
 
     # 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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+appVersion: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
 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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+version: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+appVersion: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
 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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+version: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+    tag: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
     # 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.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+appVersion: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
 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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+version: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+  tag: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
   # Variant to pull. Options are "debug" or "distroless". Unset will use the default for the given version.
   variant: ""
 

diff --git a/resources/latest/profiles/openshift-ambient.yaml b/resources/latest/profiles/openshift-ambient.yaml
@@ -2,4 +2,6 @@ apiVersion: sailoperator.io/v1alpha1
 kind: Istio
 spec:
   values:
-    profile: openshift-ambient
+    profile: ambient
+    global:
+      platform: openshift
diff --git a/resources/latest/profiles/openshift.yaml b/resources/latest/profiles/openshift.yaml
@@ -2,4 +2,5 @@ apiVersion: sailoperator.io/v1alpha1
 kind: Istio
 spec:
   values:
-    profile: openshift
+    global:
+      platform: openshift
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.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+    version: 1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7
     repo: https://github.com/istio/istio
     branch: master
-    commit: d643c2b4db7567ba3125b9b7b9c6a11dc152cb66
+    commit: 8aea55efd28f8d3348ca8529d5bd943c61de28c7
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66/helm/base-1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66/helm/cni-1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66/helm/gateway-1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66/helm/istiod-1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66/helm/ztunnel-1.24-alpha.d643c2b4db7567ba3125b9b7b9c6a11dc152cb66.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7/helm/base-1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7/helm/cni-1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7/helm/gateway-1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7/helm/istiod-1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7/helm/ztunnel-1.24-alpha.8aea55efd28f8d3348ca8529d5bd943c61de28c7.tgz