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

…513) Signed-off-by: openshift-service-mesh-bot <[email protected]>
istio-ecosystem · Dec 7, 2024 · 531b2f1 · 531b2f1
1 parent 02d1c8a
commit 531b2f1
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 45 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-3d91e3d29bd1057b14995647d90cbf85e043eba6",
+  "image": "gcr.io/istio-testing/build-tools:master-9b28a57f4095507d0bba5fbc73295ce7c12d2712",
   "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-3d91e3d29bd1057b14995647d90cbf85e043eba6
+      image: gcr.io/istio-testing/build-tools:master-9b28a57f4095507d0bba5fbc73295ce7c12d2712
       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-06T08:47:58Z"
+    createdAt: "2024-12-07T05:06:11Z"
     description: Experimental operator for installing Istio service mesh
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "true"
@@ -358,7 +358,7 @@ spec:
     - v1.22.6
     - v1.22.5
     - v1.21.6
-    - latest (8051a30d)
+    - latest (c89f2faa)
 
     [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
@@ -608,10 +608,10 @@ spec:
           template:
             metadata:
               annotations:
-                images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
-                images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
-                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
-                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+                images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
+                images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
+                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
+                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
                 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
@@ -792,13 +792,13 @@ spec:
   provider:
     name: Red Hat, Inc.
   relatedImages:
-  - image: gcr.io/istio-testing/install-cni:1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+  - image: gcr.io/istio-testing/install-cni:1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
     name: latest.cni
-  - image: gcr.io/istio-testing/pilot:1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+  - image: gcr.io/istio-testing/pilot:1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
     name: latest.istiod
-  - image: gcr.io/istio-testing/proxyv2:1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+  - image: gcr.io/istio-testing/proxyv2:1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
     name: latest.proxy
-  - image: gcr.io/istio-testing/ztunnel:1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+  - image: gcr.io/istio-testing/ztunnel:1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
     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 (8051a30d)
+    - latest (c89f2faa)
 
     [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 @@
-0c9fb08313dd6aea2f256d6a3819fdea8269feea
+f8adbcac4f93b18988097f2fdaf38aa401a3ce72
diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk
@@ -108,6 +108,9 @@ update-common:
 	fi
 	@cp -a $(TMP)/common-files/files/* $(TMP)/common-files/files/.devcontainer $(TMP)/common-files/files/.gitattributes $(shell pwd)
 	@rm -fr $(TMP)/common-files
+	@if [ "$(AUTOMATOR_REPO)" != "proxy" ]; then\
+		sed -i -e 's/build-tools:/build-tools-proxy:/g' .devcontainer/devcontainer.json;\
+	fi
 	@$(or $(COMMONFILES_POSTPROCESS), true)
 
 check-clean-repo:

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-3d91e3d29bd1057b14995647d90cbf85e043eba6
+  IMAGE_VERSION=master-9b28a57f4095507d0bba5fbc73295ce7c12d2712
 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.20241204015120-8f91b6fd01de
-	istio.io/istio v0.0.0-20241206003106-8051a30d73b6
+	istio.io/client-go v1.24.0-alpha.0.0.20241206224607-eea6e6266b54
+	istio.io/istio v0.0.0-20241207002607-c89f2faa57b4
 	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.20241204014820-f3e32c3b7a56 // indirect
+	istio.io/api v1.24.0-alpha.0.0.20241206224309-34847826d7a1 // 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.20241204014820-f3e32c3b7a56 h1:sG5j5h8Xph+tyJSURUw6j0dxARnQ27JEov6TEMQz/yM=
-istio.io/api v1.24.0-alpha.0.0.20241204014820-f3e32c3b7a56/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
-istio.io/client-go v1.24.0-alpha.0.0.20241204015120-8f91b6fd01de h1:BmRGuLcI0YBdbtmPQQLyFx10CF3CRkzXJniuvsmpCyQ=
-istio.io/client-go v1.24.0-alpha.0.0.20241204015120-8f91b6fd01de/go.mod h1:+D0rb9jJ2uSUF3ew4CES/Gch/SZbrzA3NU6jAxx+dwc=
-istio.io/istio v0.0.0-20241206003106-8051a30d73b6 h1:p5QLFC+xxlDXkd0O8wwN/f6fYlczw9lXSQulGW4ZuqM=
-istio.io/istio v0.0.0-20241206003106-8051a30d73b6/go.mod h1:5MSIeN4xUz+HFe69b9268rl0WTpol5PPgCf/YmQduwY=
+istio.io/api v1.24.0-alpha.0.0.20241206224309-34847826d7a1 h1:XU+iuiOD2OYKUAIDwUZN8CkCp85/D12GGmVl2yPUJls=
+istio.io/api v1.24.0-alpha.0.0.20241206224309-34847826d7a1/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
+istio.io/client-go v1.24.0-alpha.0.0.20241206224607-eea6e6266b54 h1:ItRe0bDS7jevbhZl2eyc+MJltG+lBLhncKMC98MgpWA=
+istio.io/client-go v1.24.0-alpha.0.0.20241206224607-eea6e6266b54/go.mod h1:rWmOhjaMxBNXeiMe4VMPqW8ZxKgdex1hpucdEGI9xwU=
+istio.io/istio v0.0.0-20241207002607-c89f2faa57b4 h1:4albbFRW878C9BpFKbgDlIvZ/eodEXnHiPuVuxGuGwM=
+istio.io/istio v0.0.0-20241207002607-c89f2faa57b4/go.mod h1:5MSIeN4xUz+HFe69b9268rl0WTpol5PPgCf/YmQduwY=
 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+appVersion: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+version: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+appVersion: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+version: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml
@@ -113,7 +113,7 @@ _internal_defaults_do_not_set:
     hub: gcr.io/istio-testing
 
     # Default tag for Istio images.
-    tag: 1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+    tag: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
 
     # 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+appVersion: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+version: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+appVersion: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+version: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+    tag: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
     # 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+    tag: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
     # 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+appVersion: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+version: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+  tag: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
   # 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.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+    version: 1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
     repo: https://github.com/istio/istio
     branch: master
-    commit: 8051a30d73b62f2b4a9d33c4fa7e3d256c79933d
+    commit: c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d/helm/base-1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d/helm/cni-1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d/helm/gateway-1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d/helm/istiod-1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d/helm/ztunnel-1.25-alpha.8051a30d73b62f2b4a9d33c4fa7e3d256c79933d.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471/helm/base-1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471/helm/cni-1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471/helm/gateway-1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471/helm/istiod-1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471/helm/ztunnel-1.25-alpha.c89f2faa57b4bc0d4c5e60c0cc6a20fd6fcbe471.tgz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0c9fb08313dd6aea2f256d6a3819fdea8269feea
		f8adbcac4f93b18988097f2fdaf38aa401a3ce72