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

Signed-off-by: openshift-service-mesh-bot <[email protected]>
openshift-service-mesh-bot · Dec 3, 2024 · 7d36966 · 7d36966
1 parent 9579529
commit 7d36966
Show file tree

Hide file tree

Showing 23 changed files with 50 additions and 50 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:master-12939d7be6baee95d63b1a9d7c4e194f1b241257",
+  "image": "gcr.io/istio-testing/build-tools:master-3d91e3d29bd1057b14995647d90cbf85e043eba6",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

diff --git a/.github/workflows/update-deps.yaml b/.github/workflows/update-deps.yaml
@@ -23,7 +23,7 @@ jobs:
   update-deps:
     runs-on: ubuntu-latest
     container:
-      image: gcr.io/istio-testing/build-tools:master-12939d7be6baee95d63b1a9d7c4e194f1b241257
+      image: gcr.io/istio-testing/build-tools:master-3d91e3d29bd1057b14995647d90cbf85e043eba6
       options: --entrypoint ''
 
     steps:

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-12-02T05:05:15Z"
+    createdAt: "2024-12-03T05:05:09Z"
     description: Experimental operator for installing Istio service mesh
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "true"
@@ -325,7 +325,7 @@ spec:
     - v1.22.6
     - v1.22.5
     - v1.21.6
-    - latest (aaad4968)
+    - latest (4be14bb2)
 
     [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
@@ -575,10 +575,10 @@ spec:
           template:
             metadata:
               annotations:
-                images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
-                images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
-                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
-                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+                images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
+                images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
+                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
+                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
                 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
@@ -759,13 +759,13 @@ spec:
   provider:
     name: Red Hat, Inc.
   relatedImages:
-  - image: gcr.io/istio-testing/install-cni:1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+  - image: gcr.io/istio-testing/install-cni:1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
     name: latest.cni
-  - image: gcr.io/istio-testing/pilot:1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+  - image: gcr.io/istio-testing/pilot:1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
     name: latest.istiod
-  - image: gcr.io/istio-testing/proxyv2:1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+  - image: gcr.io/istio-testing/proxyv2:1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
     name: latest.proxy
-  - image: gcr.io/istio-testing/ztunnel:1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+  - image: gcr.io/istio-testing/ztunnel:1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
     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
@@ -25,7 +25,7 @@ csv:
     - v1.22.6
     - v1.22.5
     - v1.21.6
-    - latest (aaad4968)
+    - latest (4be14bb2)
 
     [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/common/.commonfiles.sha b/common/.commonfiles.sha
@@ -1 +1 @@
-e955cacd8ba890189a80551485d35a0e228276ec
+a51c98a54f1d406a21dd2ff0c7bf49ff995dde23
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
@@ -75,7 +75,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-12939d7be6baee95d63b1a9d7c4e194f1b241257
+  IMAGE_VERSION=master-3d91e3d29bd1057b14995647d90cbf85e043eba6
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools

diff --git a/go.mod b/go.mod
@@ -25,8 +25,8 @@ require (
 	gomodules.xyz/jsonpatch/v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.16.3
-	istio.io/client-go v1.24.0-alpha.0.0.20241123091016-df47c87e86db
-	istio.io/istio v0.0.0-20241201151434-aaad49680670
+	istio.io/client-go v1.24.0-alpha.0.0.20241202175036-12628fdc37ad
+	istio.io/istio v0.0.0-20241203020736-4be14bb2639c
 	k8s.io/api v0.31.2
 	k8s.io/apiextensions-apiserver v0.31.2
 	k8s.io/apimachinery v0.31.2
@@ -169,7 +169,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.20241123090716-918717d1a2a5 // indirect
+	istio.io/api v1.24.0-alpha.0.0.20241202174437-505f7231aa47 // indirect
 	k8s.io/apiserver v0.31.2 // indirect
 	k8s.io/component-base v0.31.2 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect

diff --git a/go.sum b/go.sum
@@ -495,12 +495,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.3 h1:kb8bSxMeRJ+knsK/ovvlaVPfdis0X3/ZhYCSFRP+YmY=
 helm.sh/helm/v3 v3.16.3/go.mod h1:zeVWGDR4JJgiRbT3AnNsjYaX8OTJlIE9zC+Q7F7iUSU=
-istio.io/api v1.24.0-alpha.0.0.20241123090716-918717d1a2a5 h1:YkSovYqcLmX7W1grfnyRfqsRuxenxi1UOFOksQZcq+M=
-istio.io/api v1.24.0-alpha.0.0.20241123090716-918717d1a2a5/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
-istio.io/client-go v1.24.0-alpha.0.0.20241123091016-df47c87e86db h1:aVs0RM/sBTjEF6aOuiB6Vdu8oBZWf8dX60FyOX2a0ug=
-istio.io/client-go v1.24.0-alpha.0.0.20241123091016-df47c87e86db/go.mod h1:Sjf49Th3Q1mo9jtKinGWR05KZMxv1iS20z/ow4DST88=
-istio.io/istio v0.0.0-20241201151434-aaad49680670 h1:wx/7upVCxMPCShWsGo+WD+LzO+W85+GKNJ9Yd9Voe3o=
-istio.io/istio v0.0.0-20241201151434-aaad49680670/go.mod h1:yCxyDlP7xKP/1FRKJidNvcqvPs3qNyfQX/e0tpa1Gc0=
+istio.io/api v1.24.0-alpha.0.0.20241202174437-505f7231aa47 h1:an3n6EEcIWsaR0ZGsP6Uxk9dOa4iGUSncgvwQNzUytM=
+istio.io/api v1.24.0-alpha.0.0.20241202174437-505f7231aa47/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
+istio.io/client-go v1.24.0-alpha.0.0.20241202175036-12628fdc37ad h1:nJElaT/3/qjmTMRNRNPAwzD2fcEo93qrcBh9dx/eMEo=
+istio.io/client-go v1.24.0-alpha.0.0.20241202175036-12628fdc37ad/go.mod h1:C5cAtn6inKY9cbs0RGd9jkyQUHrU50yf+HW+0u2Uj9g=
+istio.io/istio v0.0.0-20241203020736-4be14bb2639c h1:sWmTR5MBFQAAWNMkb7dkKgLvkV2pktC4YfJkVRhh3jU=
+istio.io/istio v0.0.0-20241203020736-4be14bb2639c/go.mod h1:pu61EY44cMR2L9CBSwG715dxd0oqFH5LJjzI7X2lbBw=
 k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
 k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
 k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0=

diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: 1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+appVersion: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
 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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+version: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
diff --git a/resources/latest/charts/base/files/profile-platform-k3s.yaml b/resources/latest/charts/base/files/profile-platform-k3s.yaml
@@ -4,4 +4,4 @@
 
 cni:
   cniConfDir: /var/lib/rancher/k3s/agent/etc/cni/net.d
-  cniBinDir: /var/lib/rancher/k3s/data/current/bin/
+  cniBinDir: /var/lib/rancher/k3s/data/cni
diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+appVersion: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
 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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+version: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
diff --git a/resources/latest/charts/cni/files/profile-platform-k3s.yaml b/resources/latest/charts/cni/files/profile-platform-k3s.yaml
@@ -4,4 +4,4 @@
 
 cni:
   cniConfDir: /var/lib/rancher/k3s/agent/etc/cni/net.d
-  cniBinDir: /var/lib/rancher/k3s/data/current/bin/
+  cniBinDir: /var/lib/rancher/k3s/data/cni
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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+    tag: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
 
     # 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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+appVersion: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
 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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+version: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
diff --git a/resources/latest/charts/gateway/files/profile-platform-k3s.yaml b/resources/latest/charts/gateway/files/profile-platform-k3s.yaml
@@ -4,4 +4,4 @@
 
 cni:
   cniConfDir: /var/lib/rancher/k3s/agent/etc/cni/net.d
-  cniBinDir: /var/lib/rancher/k3s/data/current/bin/
+  cniBinDir: /var/lib/rancher/k3s/data/cni
diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+appVersion: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
 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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+version: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
diff --git a/resources/latest/charts/istiod/files/profile-platform-k3s.yaml b/resources/latest/charts/istiod/files/profile-platform-k3s.yaml
@@ -4,4 +4,4 @@
 
 cni:
   cniConfDir: /var/lib/rancher/k3s/agent/etc/cni/net.d
-  cniBinDir: /var/lib/rancher/k3s/data/current/bin/
+  cniBinDir: /var/lib/rancher/k3s/data/cni
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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+    tag: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
     # Variant of the image to use.
     # Currently supported are: [debug, distroless]
     variant: ""

diff --git a/resources/latest/charts/revisiontags/values.yaml b/resources/latest/charts/revisiontags/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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+    tag: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
     # 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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+appVersion: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
 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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+version: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
diff --git a/resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml b/resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
@@ -4,4 +4,4 @@
 
 cni:
   cniConfDir: /var/lib/rancher/k3s/agent/etc/cni/net.d
-  cniBinDir: /var/lib/rancher/k3s/data/current/bin/
+  cniBinDir: /var/lib/rancher/k3s/data/cni
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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+  tag: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
   # 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,13 +84,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.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b
+    version: 1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce
     repo: https://github.com/istio/istio
     branch: master
-    commit: aaad4968067044f51f305dc78c5f267a478e746b
+    commit: 4be14bb2639c48db279ac7589ef23ce97dd367ce
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b/helm/base-1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b/helm/cni-1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b/helm/gateway-1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b/helm/istiod-1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b/helm/ztunnel-1.25-alpha.aaad4968067044f51f305dc78c5f267a478e746b.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce/helm/base-1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce/helm/cni-1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce/helm/gateway-1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce/helm/istiod-1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce/helm/ztunnel-1.25-alpha.4be14bb2639c48db279ac7589ef23ce97dd367ce.tgz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e955cacd8ba890189a80551485d35a0e228276ec
		a51c98a54f1d406a21dd2ff0c7bf49ff995dde23