From 4838bbd866fd8d8c17c5ba55a4f6f178d91d149c Mon Sep 17 00:00:00 2001 From: maistra-bot <57098434+maistra-bot@users.noreply.github.com> Date: Thu, 8 Feb 2024 04:55:41 +0100 Subject: [PATCH] [maistra-3.0] Automator: Update dependencies (#1621) Co-authored-by: maistra-bot --- .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 ad93158d6..6feea4653 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-ad9c72da1becdfd5b422ac2db099e449b4e0655f", + "image": "gcr.io/istio-testing/build-tools:master-98611daf69a610cfdd40df05d9496013a46dfefe", "privileged": true, "remoteEnv": { "USE_GKE_GCLOUD_AUTH_PLUGIN": "True", diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index d31c713c0..86409353a 100644 --- a/bundle/manifests/sailoperator.clusterserviceversion.yaml +++ b/bundle/manifests/sailoperator.clusterserviceversion.yaml @@ -23,7 +23,7 @@ metadata: capabilities: Seamless Upgrades categories: OpenShift Optional, Integration & Delivery, Networking, Security containerImage: quay.io/maistra-dev/istio-operator:3.0-latest - createdAt: "2024-02-07T03:07:26Z" + createdAt: "2024-02-08T03:05:38Z" description: Experimental operator for installing Istio service mesh operators.operatorframework.io/builder: operator-sdk-v1.33.0 operators.operatorframework.io/internal-objects: '["wasmplugins.extensions.istio.io","destinationrules.networking.istio.io","envoyfilters.networking.istio.io","gateways.networking.istio.io","proxyconfigs.networking.istio.io","serviceentries.networking.istio.io","sidecars.networking.istio.io","virtualservices.networking.istio.io","workloadentries.networking.istio.io","workloadgroups.networking.istio.io","authorizationpolicies.security.istio.io","peerauthentications.security.istio.io","requestauthentications.security.istio.io","telemetries.telemetry.istio.io"]' @@ -221,7 +221,7 @@ spec: - v1.20.2 - v1.20.1 - v1.19.6 - - latest (d173c176) + - latest (ffed2074) - gwAPIControllerMode [See this page](https://github.com/maistra/istio-operator/blob/maistra-3.0/bundle/README.md) for instructions on how to use it. diff --git a/chart/values.yaml b/chart/values.yaml index 2612be76e..870b035b6 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -19,7 +19,7 @@ csv: - v1.20.2 - v1.20.1 - v1.19.6 - - latest (d173c176) + - latest (ffed2074) - gwAPIControllerMode [See this page](https://github.com/maistra/istio-operator/blob/maistra-3.0/bundle/README.md) for instructions on how to use it. diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index d6140632e..40f78f4b7 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -2cfe47bd06fdc2e09a4e6ac25c02f862de47c671 +f3ed58a96a17fd76298cfe6d02eb5c1881f97eea diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh index 230d8c0f1..600baa790 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-ad9c72da1becdfd5b422ac2db099e449b4e0655f + IMAGE_VERSION=master-98611daf69a610cfdd40df05d9496013a46dfefe fi if [[ "${IMAGE_NAME:-}" == "" ]]; then IMAGE_NAME=build-tools diff --git a/go.mod b/go.mod index ccf0f2045..49f43aaa0 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.14.0 - istio.io/client-go v1.19.0-alpha.1.0.20240206014934-cd335b678e29 - istio.io/istio v0.0.0-20240207012018-d173c176d2af + istio.io/client-go v1.19.0-alpha.1.0.20240207160224-9c559e3f3fc2 + istio.io/istio v0.0.0-20240208010324-ffed2074bd92 k8s.io/api v0.29.1 k8s.io/apimachinery v0.29.1 k8s.io/cli-runtime v0.29.1 @@ -156,7 +156,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.19.0-alpha.1.0.20240206014034-64291ae9cc24 // indirect + istio.io/api v1.19.0-alpha.1.0.20240207155557-6ee624502f45 // indirect k8s.io/apiextensions-apiserver v0.29.1 // indirect k8s.io/apiserver v0.29.1 // indirect k8s.io/component-base v0.29.1 // indirect diff --git a/go.sum b/go.sum index 5c02b97ba..1c2f1b5d0 100644 --- a/go.sum +++ b/go.sum @@ -529,12 +529,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.14.0 h1:TaZIH6uOchn7L27ptwnnuHJiFrT/BsD4dFdp/HLT2nM= helm.sh/helm/v3 v3.14.0/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424= -istio.io/api v1.19.0-alpha.1.0.20240206014034-64291ae9cc24 h1:NuinLmAcI9oF36tvTsID84kMjZdlEl/Wnd1n3hNGbNc= -istio.io/api v1.19.0-alpha.1.0.20240206014034-64291ae9cc24/go.mod h1:TFCMUCAHRjxBv1CsIsFCsYHPHi4axVI4vdIzVr8eFjY= -istio.io/client-go v1.19.0-alpha.1.0.20240206014934-cd335b678e29 h1:Tohw5CftQOlTo1KngTOYi9K8kIkG5Qh/LPYDx+oT5MQ= -istio.io/client-go v1.19.0-alpha.1.0.20240206014934-cd335b678e29/go.mod h1:bWw8xtF43oLF0mxKMoeqKnsRGs/8K4G87SFbjx8jYo8= -istio.io/istio v0.0.0-20240207012018-d173c176d2af h1:QPQufOnmY6uKBbO3bc8VDV7J9JpWHeVoxukc3Pm756E= -istio.io/istio v0.0.0-20240207012018-d173c176d2af/go.mod h1:gACG8IErTmZGtauYcc/OPWUyfvGBzn6nNv2mI+RpGHk= +istio.io/api v1.19.0-alpha.1.0.20240207155557-6ee624502f45 h1:+veezlPqBkBdVTI/oDFhRv7xP3vgJE0+wvEamq5bp0A= +istio.io/api v1.19.0-alpha.1.0.20240207155557-6ee624502f45/go.mod h1:TFCMUCAHRjxBv1CsIsFCsYHPHi4axVI4vdIzVr8eFjY= +istio.io/client-go v1.19.0-alpha.1.0.20240207160224-9c559e3f3fc2 h1:/pxP+VbN/Xyyqb4EdQLeBbdAlPfIPZmQ8VBrSfZ02FM= +istio.io/client-go v1.19.0-alpha.1.0.20240207160224-9c559e3f3fc2/go.mod h1:EKu/MT2yek50mTMIdBGScXBgNatFH9reqvtTuYLr5lo= +istio.io/istio v0.0.0-20240208010324-ffed2074bd92 h1:YxhEu2lLwuBomTsEZZuLrQgYgmSYTfTl05QHdhEi0fI= +istio.io/istio v0.0.0-20240208010324-ffed2074bd92/go.mod h1:c/EJafelMaRruaRomQm9cffS3TX0AbD60itcC6Z//Fs= k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw= k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ= k8s.io/apiextensions-apiserver v0.29.1 h1:S9xOtyk9M3Sk1tIpQMu9wXHm5O2MX6Y1kIpPMimZBZw= diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index f8c9a2bb4..981339f00 100644 --- a/resources/latest/charts/base/Chart.yaml +++ b/resources/latest/charts/base/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +appVersion: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b 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.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +version: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index 535944452..72f010d7d 100644 --- a/resources/latest/charts/cni/Chart.yaml +++ b/resources/latest/charts/cni/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +appVersion: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b 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/tree/master/cni -version: 1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +version: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index be8cbcb5f..8c8ced72d 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -116,7 +116,7 @@ defaults: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f + tag: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b # 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 2ff73f2aa..97562efb0 100644 --- a/resources/latest/charts/gateway/Chart.yaml +++ b/resources/latest/charts/gateway/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +appVersion: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b 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.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +version: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index 97a2acde6..229ec3c19 100644 --- a/resources/latest/charts/istiod/Chart.yaml +++ b/resources/latest/charts/istiod/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +appVersion: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b 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.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +version: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index f921128e2..48e9ff1e5 100644 --- a/resources/latest/charts/istiod/values.yaml +++ b/resources/latest/charts/istiod/values.yaml @@ -216,7 +216,7 @@ defaults: # Dev builds from prow are on gcr.io hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f + tag: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b # 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 411546ae4..8cba2d4fb 100644 --- a/resources/latest/charts/ztunnel/Chart.yaml +++ b/resources/latest/charts/ztunnel/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +appVersion: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b 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.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f +version: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index 7d5963dc1..dd218c772 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.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f + tag: 1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b # 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 dc1ae26a0..2e7b6857f 100644 --- a/versions.yaml +++ b/versions.yaml @@ -39,13 +39,13 @@ versions: - name: latest repo: https://github.com/istio/istio branch: master - commit: d173c176d2af9e87547635e9382a254c6315d51f + commit: ffed2074bd92a84b9bd87577e41226c3cfac1a9b charts: - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f/helm/base-1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f.tgz - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f/helm/cni-1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f.tgz - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f/helm/gateway-1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f.tgz - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f/helm/istiod-1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f.tgz - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f/helm/ztunnel-1.22-alpha.d173c176d2af9e87547635e9382a254c6315d51f.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b/helm/base-1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b/helm/cni-1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b/helm/gateway-1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b/helm/istiod-1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b/helm/ztunnel-1.22-alpha.ffed2074bd92a84b9bd87577e41226c3cfac1a9b.tgz # Temporary PoC that uses a branch in our fork of istio/istio - name: gwAPIControllerMode repo: https://github.com/maistra/istio