From f7dbfbd922d7d5b0793b4ef36aa0460e1315a91c Mon Sep 17 00:00:00 2001 From: Istio Automation Date: Tue, 2 Jul 2024 19:26:50 -0400 Subject: [PATCH] Automator: Update dependencies in istio-ecosystem/sail-operator@main (#188) Signed-off-by: istio-testing --- .devcontainer/devcontainer.json | 2 +- .../sailoperator.clusterserviceversion.yaml | 4 ++-- chart/values.yaml | 2 +- common/.commonfiles.sha | 2 +- common/scripts/setup_env.sh | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ resources/latest/charts/base/Chart.yaml | 4 ++-- resources/latest/charts/cni/Chart.yaml | 4 ++-- resources/latest/charts/cni/values.yaml | 2 +- resources/latest/charts/gateway/Chart.yaml | 4 ++-- resources/latest/charts/istiod/Chart.yaml | 4 ++-- resources/latest/charts/istiod/values.yaml | 2 +- resources/latest/charts/ztunnel/Chart.yaml | 4 ++-- resources/latest/charts/ztunnel/values.yaml | 2 +- versions.yaml | 12 ++++++------ 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 90f5c9e33..1575937ac 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "istio build-tools", - "image": "gcr.io/istio-testing/build-tools:master-b9a4a433d98c4160b77c77a93be94f2aa07c5c4d", + "image": "gcr.io/istio-testing/build-tools:master-971914c666d927bef34865d2437b78860d575065", "privileged": true, "remoteEnv": { "USE_GKE_GCLOUD_AUTH_PLUGIN": "True", diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index f0368ea7b..03a3f2215 100644 --- 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.1-latest - createdAt: "2024-07-01T23:02:14Z" + createdAt: "2024-07-02T23:07:21Z" description: Experimental operator for installing Istio service mesh features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -314,7 +314,7 @@ spec: - v1.21.3 - v1.21.2 - v1.21.0 - - latest (3bc82d83) + - latest (26b1ddaa) [See this page](https://github.com/istio-ecosystem/sail-operator/blob/pre-main/bundle/README.md) for instructions on how to use it. displayName: Sail Operator diff --git a/chart/values.yaml b/chart/values.yaml index b2b03e2c0..a48cf6d3a 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -23,7 +23,7 @@ csv: - v1.21.3 - v1.21.2 - v1.21.0 - - latest (3bc82d83) + - latest (26b1ddaa) [See this page](https://github.com/istio-ecosystem/sail-operator/blob/pre-main/bundle/README.md) for instructions on how to use it. support: Community based diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index 567df701d..7ac12405a 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -d668a644804baba70c5d6bd4b7015b30b933c6c2 +827fa4773ee564dd4a22895ab14f22bf4394ae69 diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh index b5839c08c..3b490d81f 100755 --- 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-b9a4a433d98c4160b77c77a93be94f2aa07c5c4d + IMAGE_VERSION=master-971914c666d927bef34865d2437b78860d575065 fi if [[ "${IMAGE_NAME:-}" == "" ]]; then IMAGE_NAME=build-tools diff --git a/go.mod b/go.mod index b5ce67eaa..b2b19509f 100644 --- a/go.mod +++ b/go.mod @@ -18,8 +18,8 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.15.1 - istio.io/client-go v1.22.0-alpha.1.0.20240628002726-154dca4cbde3 - istio.io/istio v0.0.0-20240701200849-3bc82d831f72 + istio.io/client-go v1.22.0-alpha.1.0.20240702165150-3a2b33ef5908 + istio.io/istio v0.0.0-20240702222450-26b1ddaa2b19 k8s.io/api v0.30.1 k8s.io/apiextensions-apiserver v0.30.1 k8s.io/apimachinery v0.30.1 @@ -152,7 +152,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.22.0-alpha.1.0.20240628002226-74890bf7da5e // indirect + istio.io/api v1.22.0-alpha.1.0.20240702164451-f46cb27eb224 // indirect k8s.io/apiserver v0.30.1 // indirect k8s.io/component-base v0.30.1 // indirect k8s.io/klog/v2 v2.120.1 // indirect diff --git a/go.sum b/go.sum index 30ea0d980..398a1a0f7 100644 --- a/go.sum +++ b/go.sum @@ -491,12 +491,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.15.1 h1:22ztacHz4gMqhXNqCQ9NAg6BFWoRUryNLvnkz6OVyw0= helm.sh/helm/v3 v3.15.1/go.mod h1:fvfoRcB8UKRUV5jrIfOTaN/pG1TPhuqSb56fjYdTKXg= -istio.io/api v1.22.0-alpha.1.0.20240628002226-74890bf7da5e h1:dTpB6hS83KYxX4WqFj0AR58GTAD2koYTu/Uj9hBVmxg= -istio.io/api v1.22.0-alpha.1.0.20240628002226-74890bf7da5e/go.mod h1:THZA8sI/o2TXhmTM3P2EejCuE8VtWdMdrDQMD9FbdoU= -istio.io/client-go v1.22.0-alpha.1.0.20240628002726-154dca4cbde3 h1:TkrleoSwb1NQ/0VYJk7yR5rZYnJ4kHxyDOWAJUneTcw= -istio.io/client-go v1.22.0-alpha.1.0.20240628002726-154dca4cbde3/go.mod h1:Mxw+NyMaiY6h0LrYucNmTFVcJEEvY9H/Wag8LUdH8gE= -istio.io/istio v0.0.0-20240701200849-3bc82d831f72 h1:1V9KFl3MTb8yOn3wZAQXoH9AJq+ICQ10zaaOAejPtjI= -istio.io/istio v0.0.0-20240701200849-3bc82d831f72/go.mod h1:x8CukJ3beoRqWZBmr9UUNdAMFwNUg4roF0045oClfDI= +istio.io/api v1.22.0-alpha.1.0.20240702164451-f46cb27eb224 h1:nawTVi8duCjTmNva61+FfkMDO8iocfLUP6k4Xa/06yw= +istio.io/api v1.22.0-alpha.1.0.20240702164451-f46cb27eb224/go.mod h1:THZA8sI/o2TXhmTM3P2EejCuE8VtWdMdrDQMD9FbdoU= +istio.io/client-go v1.22.0-alpha.1.0.20240702165150-3a2b33ef5908 h1:DJVoG0iUwjvcCHocmJW2x+noXznIjBtdGFf0bEiLXik= +istio.io/client-go v1.22.0-alpha.1.0.20240702165150-3a2b33ef5908/go.mod h1:L41RefFjW+mXOskt/FUnU7rhkxXW2t4UQBOt8tigfIA= +istio.io/istio v0.0.0-20240702222450-26b1ddaa2b19 h1:IaJvoNYB7Id3JiYYPts0n820nDvpYfHLHLg49nCPD1s= +istio.io/istio v0.0.0-20240702222450-26b1ddaa2b19/go.mod h1:XRvZLK5cteltoGAWn4bckMM/LMiHPJfAQam4FWsoQgY= k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY= k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM= k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws= diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index e4a93a963..4d3970fc6 100644 --- a/resources/latest/charts/base/Chart.yaml +++ b/resources/latest/charts/base/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +appVersion: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a description: Helm chart for deploying Istio cluster resources and CRDs icon: https://istio.io/latest/favicons/android-192x192.png keywords: @@ -7,4 +7,4 @@ keywords: name: base sources: - https://github.com/istio/istio -version: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +version: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index d56cf6b9c..8dad5edcf 100644 --- a/resources/latest/charts/cni/Chart.yaml +++ b/resources/latest/charts/cni/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +appVersion: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a 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.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +version: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index 7ff53a68b..aa94cef9e 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -112,7 +112,7 @@ defaults: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 + tag: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a # 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 index 3c6db31bf..3e1c9920d 100644 --- a/resources/latest/charts/gateway/Chart.yaml +++ b/resources/latest/charts/gateway/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +appVersion: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a 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.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +version: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index 8dd4d6b87..6d1cd6d94 100644 --- a/resources/latest/charts/istiod/Chart.yaml +++ b/resources/latest/charts/istiod/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +appVersion: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a 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.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +version: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index d025bbde1..5842bd186 100644 --- a/resources/latest/charts/istiod/values.yaml +++ b/resources/latest/charts/istiod/values.yaml @@ -242,7 +242,7 @@ defaults: # Dev builds from prow are on gcr.io hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 + tag: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a # 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 index 346425113..ba4f1f2d1 100644 --- a/resources/latest/charts/ztunnel/Chart.yaml +++ b/resources/latest/charts/ztunnel/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +appVersion: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a 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.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 +version: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index fae39e6bf..31e6588c8 100644 --- a/resources/latest/charts/ztunnel/values.yaml +++ b/resources/latest/charts/ztunnel/values.yaml @@ -2,7 +2,7 @@ defaults: # 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.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9 + tag: 1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a # 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 index c859b49cf..692fa0f69 100644 --- a/versions.yaml +++ b/versions.yaml @@ -84,10 +84,10 @@ versions: version: 1.23-alpha repo: https://github.com/istio/istio branch: master - commit: 3bc82d831f7260991cd4c16d34c8fc28092c81b9 + commit: 26b1ddaa2b19189724f42707284c38ab8f30934a charts: - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/base-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/cni-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/gateway-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/istiod-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9/helm/ztunnel-1.23-alpha.3bc82d831f7260991cd4c16d34c8fc28092c81b9.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a/helm/base-1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a/helm/cni-1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a/helm/gateway-1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a/helm/istiod-1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a/helm/ztunnel-1.23-alpha.26b1ddaa2b19189724f42707284c38ab8f30934a.tgz