Automated merge

* upstream/main: Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#572) # Conflicts: # bundle/manifests/sailoperator.clusterserviceversion.yaml # resources/latest/charts/base/Chart.yaml # resources/latest/charts/cni/Chart.yaml # resources/latest/charts/cni/values.yaml # resources/latest/charts/gateway/Chart.yaml # resources/latest/charts/istiod/Chart.yaml # resources/latest/charts/istiod/values.yaml # resources/latest/charts/revisiontags/values.yaml # resources/latest/charts/ztunnel/Chart.yaml # resources/latest/charts/ztunnel/values.yaml
openshift-service-mesh-bot · Jan 22, 2025 · 2f815e8 · 2f815e8
2 parents 6f561e3 + c0a60ee
commit 2f815e8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 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-ba6e7d3a0ff9666b1cc2a650507b0d99acfefff4",
+  "image": "gcr.io/istio-testing/build-tools:master-6bfe0028e941afdae35a3c5d4374bc08e3c04153",
   "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-ba6e7d3a0ff9666b1cc2a650507b0d99acfefff4
+      image: gcr.io/istio-testing/build-tools:master-6bfe0028e941afdae35a3c5d4374bc08e3c04153
       options: --entrypoint ''
 
     steps:

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -28,7 +28,7 @@ csv:
     - v1.22.6
     - v1.22.5
     - v1.21.6
-    - latest (f5e8aceb)
+    - latest (ad7809a2)
 
     [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 @@
-272e6cbb1bfbeceeec17ba3ab6a103305db2725b
+0534ded1b742f889f515f2c651122889c382aac4
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-ba6e7d3a0ff9666b1cc2a650507b0d99acfefff4
+  IMAGE_VERSION=master-6bfe0028e941afdae35a3c5d4374bc08e3c04153
 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.20250103213757-fb95213c2bc2
-	istio.io/istio v0.0.0-20250121024955-f5e8aceb905b
+	istio.io/client-go v1.25.0-alpha.0.0.20250103213757-fb95213c2bc2
+	istio.io/istio v0.0.0-20250122020456-ad7809a27990
 	k8s.io/api v0.32.0
 	k8s.io/apiextensions-apiserver v0.32.0
 	k8s.io/apimachinery v0.32.0

diff --git a/go.sum b/go.sum
@@ -496,10 +496,10 @@ 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.20250103213058-f293e9c39285 h1:HMEJDYg8lxp2g/I7oHZPX91DkbYlHKYBJ+hm76U6Q24=
 istio.io/api v1.24.0-alpha.0.0.20250103213058-f293e9c39285/go.mod h1:QFzEXv/IT582T0FHZVp1QoolvE4ws0zz/vVO55blmlE=
-istio.io/client-go v1.24.0-alpha.0.0.20250103213757-fb95213c2bc2 h1:egds+0nRCW+ACMq0Zj+mQ7rdZFiuJWhduL+JF847Njc=
-istio.io/client-go v1.24.0-alpha.0.0.20250103213757-fb95213c2bc2/go.mod h1:SxwtgVDTEray23wIAmsXnzpXiKckYH3G+TISxorESUo=
-istio.io/istio v0.0.0-20250121024955-f5e8aceb905b h1:xOS8HMvq+SZB7FrtwOkh4K3pp2YKZPvqMdNLe55LdQ4=
-istio.io/istio v0.0.0-20250121024955-f5e8aceb905b/go.mod h1:gwxuNcyDdTWkypGK2J6ENSeGrNfIzWBsxGLsm5MHpRA=
+istio.io/client-go v1.25.0-alpha.0.0.20250103213757-fb95213c2bc2 h1:lLGNyELRQJtgqFT6ibd2bEsIgDRKBZ+iQMrOgMY/q1s=
+istio.io/client-go v1.25.0-alpha.0.0.20250103213757-fb95213c2bc2/go.mod h1:SxwtgVDTEray23wIAmsXnzpXiKckYH3G+TISxorESUo=
+istio.io/istio v0.0.0-20250122020456-ad7809a27990 h1:RUqpwtQl7SCYh3cSoOzgPTQqem3kYjPTQfPYEsvbJn4=
+istio.io/istio v0.0.0-20250122020456-ad7809a27990/go.mod h1:gwxuNcyDdTWkypGK2J6ENSeGrNfIzWBsxGLsm5MHpRA=
 k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
 k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
 k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0=

diff --git a/versions.yaml b/versions.yaml
@@ -115,13 +115,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.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711
+    version: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
     repo: https://github.com/istio/istio
     branch: master
-    commit: f5e8aceb905b417e948e3d8b89e5a0ddc1d39711
+    commit: ad7809a279900cd2922437b2d5b26da7bd47fe4f
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711/helm/base-1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711/helm/cni-1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711/helm/gateway-1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711/helm/istiod-1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711/helm/ztunnel-1.25-alpha.f5e8aceb905b417e948e3d8b89e5a0ddc1d39711.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/base-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/cni-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/gateway-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/istiod-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/ztunnel-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		272e6cbb1bfbeceeec17ba3ab6a103305db2725b
		0534ded1b742f889f515f2c651122889c382aac4