From fa5c6bdc4519bf78593dba242ad0504c96714701 Mon Sep 17 00:00:00 2001 From: maistra-bot <57098434+maistra-bot@users.noreply.github.com> Date: Wed, 6 Dec 2023 05:32:40 +0100 Subject: [PATCH] [maistra-3.0] Automator: Update dependencies (#1510) Co-authored-by: maistra-bot --- .devcontainer/devcontainer.json | 2 +- .../networking.istio.io_destinationrules.yaml | 44 ++++++++++-------- .../sailoperator.clusterserviceversion.yaml | 4 +- common/.commonfiles.sha | 2 +- common/scripts/setup_env.sh | 2 +- .../networking.istio.io_destinationrules.yaml | 44 ++++++++++-------- .../sailoperator.clusterserviceversion.yaml | 2 +- go.mod | 6 +-- go.sum | 12 ++--- resources/latest/charts/base/Chart.yaml | 4 +- .../latest/charts/base/crds/crd-all.gen.yaml | 44 ++++++++++-------- resources/latest/charts/cni/Chart.yaml | 4 +- resources/latest/charts/cni/values.yaml | 2 +- resources/latest/charts/gateway/Chart.yaml | 4 +- .../latest/charts/gateway/templates/hpa.yaml | 8 ++++ resources/latest/charts/gateway/values.yaml | 1 + resources/latest/charts/istiod/Chart.yaml | 4 +- .../charts/istiod/files/kube-gateway.yaml | 44 +++++++++++++----- .../latest/charts/istiod/files/waypoint.yaml | 46 ++++++++++++------- .../charts/istiod/templates/autoscale.yaml | 14 ++++++ resources/latest/charts/istiod/values.yaml | 4 +- resources/latest/charts/ztunnel/Chart.yaml | 4 +- resources/latest/charts/ztunnel/values.yaml | 2 +- versions.yaml | 12 ++--- 24 files changed, 194 insertions(+), 121 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 479c81192..f0bb8e03f 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-7ad7b0d523dd40ef4b7161ecb03b70e25f1856cf", + "image": "gcr.io/istio-testing/build-tools:master-26cd1985031cf8c9a1ba671026b3871bd0b19750", "privileged": true, "remoteEnv": { "USE_GKE_GCLOUD_AUTH_PLUGIN": "True", diff --git a/bundle/manifests/networking.istio.io_destinationrules.yaml b/bundle/manifests/networking.istio.io_destinationrules.yaml index 708bba5e4..650a455d3 100644 --- a/bundle/manifests/networking.istio.io_destinationrules.yaml +++ b/bundle/manifests/networking.istio.io_destinationrules.yaml @@ -668,10 +668,10 @@ spec: certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding - to the host. + to the host.' nullable: true type: boolean mode: @@ -726,9 +726,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -1363,9 +1364,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -1420,9 +1422,9 @@ spec: for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the proxy + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server - certificate corresponding to the host. + certificate corresponding to the host.' nullable: true type: boolean mode: @@ -2135,10 +2137,10 @@ spec: certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding - to the host. + to the host.' nullable: true type: boolean mode: @@ -2193,9 +2195,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -2830,9 +2833,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -2887,9 +2891,9 @@ spec: for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the proxy + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server - certificate corresponding to the host. + certificate corresponding to the host.' nullable: true type: boolean mode: diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index f88abb554..b0bde2513 100644 --- a/bundle/manifests/sailoperator.clusterserviceversion.yaml +++ b/bundle/manifests/sailoperator.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Seamless Upgrades categories: OpenShift Optional, Integration & Delivery, Networking, Security containerImage: quay.io/maistra-dev/istio-operator:3.0-latest - createdAt: "2023-12-05T03:05:27Z" + createdAt: "2023-12-06T03:54:33Z" operators.operatorframework.io/builder: operator-sdk-v1.32.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"]' operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -139,7 +139,7 @@ spec: - v1.20.0 - v1.19.4 - - latest (e113513e) + - latest (bebce9a0) [See this page](https://github.com/maistra/istio-operator/blob/maistra-3.0/bundle/README.md) for instructions on how to use it. displayName: Sail Operator diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index 9fbb1ffcc..ce7048965 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -ec3c720da233662bf9fb0153e72d9c493d42e49e +11e923fe766e281c5e0714fb8d6f1e06e7ae6235 diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh index d6d8b205e..65b070404 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-7ad7b0d523dd40ef4b7161ecb03b70e25f1856cf + IMAGE_VERSION=master-26cd1985031cf8c9a1ba671026b3871bd0b19750 fi if [[ "${IMAGE_NAME:-}" == "" ]]; then IMAGE_NAME=build-tools diff --git a/config/crd/bases/networking.istio.io_destinationrules.yaml b/config/crd/bases/networking.istio.io_destinationrules.yaml index ee78c5e20..e18add1f5 100644 --- a/config/crd/bases/networking.istio.io_destinationrules.yaml +++ b/config/crd/bases/networking.istio.io_destinationrules.yaml @@ -667,10 +667,10 @@ spec: certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding - to the host. + to the host.' nullable: true type: boolean mode: @@ -725,9 +725,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -1362,9 +1363,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -1419,9 +1421,9 @@ spec: for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the proxy + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server - certificate corresponding to the host. + certificate corresponding to the host.' nullable: true type: boolean mode: @@ -2134,10 +2136,10 @@ spec: certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding - to the host. + to the host.' nullable: true type: boolean mode: @@ -2192,9 +2194,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -2829,9 +2832,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -2886,9 +2890,9 @@ spec: for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the proxy + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server - certificate corresponding to the host. + certificate corresponding to the host.' nullable: true type: boolean mode: diff --git a/config/manifests/bases/sailoperator.clusterserviceversion.yaml b/config/manifests/bases/sailoperator.clusterserviceversion.yaml index 3887362e5..60e137ba1 100644 --- a/config/manifests/bases/sailoperator.clusterserviceversion.yaml +++ b/config/manifests/bases/sailoperator.clusterserviceversion.yaml @@ -55,7 +55,7 @@ spec: - v1.20.0 - v1.19.4 - - latest (e113513e) + - latest (bebce9a0) [See this page](https://github.com/maistra/istio-operator/blob/maistra-3.0/bundle/README.md) for instructions on how to use it. displayName: Sail Operator diff --git a/go.mod b/go.mod index 57bae63ed..d628bca31 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.13.2 - istio.io/client-go v1.19.0-alpha.1.0.20231130211226-46ba363b2dc1 - istio.io/istio v0.0.0-20231205012852-e113513e4910 + istio.io/client-go v1.19.0-alpha.1.0.20231205224153-d0232dc763e3 + istio.io/istio v0.0.0-20231206025654-bebce9a0f1fb k8s.io/api v0.28.4 k8s.io/apimachinery v0.28.4 k8s.io/cli-runtime v0.28.4 @@ -151,7 +151,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.20231130210426-342d60d7bee6 // indirect + istio.io/api v1.19.0-alpha.1.0.20231205223454-4e3eb069953c // indirect k8s.io/apiextensions-apiserver v0.28.3 // indirect k8s.io/apiserver v0.28.4 // indirect k8s.io/component-base v0.28.4 // indirect diff --git a/go.sum b/go.sum index e148adc3d..6f96694c7 100644 --- a/go.sum +++ b/go.sum @@ -581,12 +581,12 @@ helm.sh/helm/v3 v3.13.2 h1:IcO9NgmmpetJODLZhR3f3q+6zzyXVKlRizKFwbi7K8w= helm.sh/helm/v3 v3.13.2/go.mod h1:GIHDwZggaTGbedevTlrQ6DB++LBN6yuQdeGj0HNaDx0= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -istio.io/api v1.19.0-alpha.1.0.20231130210426-342d60d7bee6 h1:79BRkx3/oIT/ywiSBg/feoeNljWS+aDlIHu6k38JWZA= -istio.io/api v1.19.0-alpha.1.0.20231130210426-342d60d7bee6/go.mod h1:hm1PE/mGdIAsjCDkTIAplP53H7TjO5LUQCiVvF26SVg= -istio.io/client-go v1.19.0-alpha.1.0.20231130211226-46ba363b2dc1 h1:po6NuHjo6zMbM3ZVmwUNhpu5Wa/TT8JmJ2JrNLhwKPg= -istio.io/client-go v1.19.0-alpha.1.0.20231130211226-46ba363b2dc1/go.mod h1:O/ihDvejNTG6qxAiEiNd1hgZIP2+n1WiLPsdPe/eJcQ= -istio.io/istio v0.0.0-20231205012852-e113513e4910 h1:QmThCtQp4ThkI9UDX6RH9H0FlmJHweFsiqaT+iKQN2c= -istio.io/istio v0.0.0-20231205012852-e113513e4910/go.mod h1:nDH1HWn44+x2IfnoA8cO4Jsvd+x8vZT0//7JLq7ugVU= +istio.io/api v1.19.0-alpha.1.0.20231205223454-4e3eb069953c h1:fTvx/y/UeM6zGKtEAfUaqEE1OB2TxRJ68Vrm+MKlJEM= +istio.io/api v1.19.0-alpha.1.0.20231205223454-4e3eb069953c/go.mod h1:hm1PE/mGdIAsjCDkTIAplP53H7TjO5LUQCiVvF26SVg= +istio.io/client-go v1.19.0-alpha.1.0.20231205224153-d0232dc763e3 h1:U4guoFAC/xGQAAq8T5UTL+imGc1M/adhPA+Y9XYkt1I= +istio.io/client-go v1.19.0-alpha.1.0.20231205224153-d0232dc763e3/go.mod h1:JN3b4Ul7JynO13F5VUhef8ixJPe0oYg43yHaSE7f3y4= +istio.io/istio v0.0.0-20231206025654-bebce9a0f1fb h1:+ki/ebStNEZXYr7zMUHhx7Q4oIVv0arXl7Sm3qnekr0= +istio.io/istio v0.0.0-20231206025654-bebce9a0f1fb/go.mod h1:ZGZ1BPQ7ryIgMemPADLcN4kb5KMBcfgR4ZOGB2mSUPA= k8s.io/api v0.28.4 h1:8ZBrLjwosLl/NYgv1P7EQLqoO8MGQApnbgH8tu3BMzY= k8s.io/api v0.28.4/go.mod h1:axWTGrY88s/5YE+JSt4uUi6NMM+gur1en2REMR7IRj0= k8s.io/apiextensions-apiserver v0.28.3 h1:Od7DEnhXHnHPZG+W9I97/fSQkVpVPQx2diy+2EtmY08= diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index 4491cbb79..c886cf709 100644 --- a/resources/latest/charts/base/Chart.yaml +++ b/resources/latest/charts/base/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +appVersion: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb 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.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +version: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb diff --git a/resources/latest/charts/base/crds/crd-all.gen.yaml b/resources/latest/charts/base/crds/crd-all.gen.yaml index e0f7007b4..643cf4939 100644 --- a/resources/latest/charts/base/crds/crd-all.gen.yaml +++ b/resources/latest/charts/base/crds/crd-all.gen.yaml @@ -883,10 +883,10 @@ spec: certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding - to the host. + to the host.' nullable: true type: boolean mode: @@ -941,9 +941,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -1578,9 +1579,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -1635,9 +1637,9 @@ spec: for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the proxy + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server - certificate corresponding to the host. + certificate corresponding to the host.' nullable: true type: boolean mode: @@ -2350,10 +2352,10 @@ spec: certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding - to the host. + to the host.' nullable: true type: boolean mode: @@ -2408,9 +2410,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -3045,9 +3048,10 @@ spec: certs for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the - proxy should skip verifying the CA signature and SAN - for the server certificate corresponding to the host. + description: '`insecureSkipVerify` specifies whether + the proxy should skip verifying the CA signature and + SAN for the server certificate corresponding to the + host.' nullable: true type: boolean mode: @@ -3102,9 +3106,9 @@ spec: for the client including the CA certificates. type: string insecureSkipVerify: - description: InsecureSkipVerify specifies whether the proxy + description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server - certificate corresponding to the host. + certificate corresponding to the host.' nullable: true type: boolean mode: diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index 31285d2b0..afae0e95c 100644 --- a/resources/latest/charts/cni/Chart.yaml +++ b/resources/latest/charts/cni/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +appVersion: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb 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.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +version: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index d8fac7989..e0c17293f 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -101,7 +101,7 @@ global: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 + tag: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb # 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 243e868fb..5f1cf0640 100644 --- a/resources/latest/charts/gateway/Chart.yaml +++ b/resources/latest/charts/gateway/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +appVersion: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb 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.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +version: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb diff --git a/resources/latest/charts/gateway/templates/hpa.yaml b/resources/latest/charts/gateway/templates/hpa.yaml index da093b71e..d95768ac9 100644 --- a/resources/latest/charts/gateway/templates/hpa.yaml +++ b/resources/latest/charts/gateway/templates/hpa.yaml @@ -28,6 +28,14 @@ spec: averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} type: Utilization {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + type: Utilization + {{- end }} {{- if .Values.autoscaling.autoscaleBehavior }} behavior: {{ toYaml .Values.autoscaling.autoscaleBehavior | nindent 4 }} {{- end }} diff --git a/resources/latest/charts/gateway/values.yaml b/resources/latest/charts/gateway/values.yaml index 7560af389..270c99b96 100644 --- a/resources/latest/charts/gateway/values.yaml +++ b/resources/latest/charts/gateway/values.yaml @@ -73,6 +73,7 @@ autoscaling: minReplicas: 1 maxReplicas: 5 targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: {} autoscaleBehavior: {} # Pod environment variables diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index dbcec9ed6..be6a577a6 100644 --- a/resources/latest/charts/istiod/Chart.yaml +++ b/resources/latest/charts/istiod/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +appVersion: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb 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.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +version: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb diff --git a/resources/latest/charts/istiod/files/kube-gateway.yaml b/resources/latest/charts/istiod/files/kube-gateway.yaml index f6703a583..53e52216d 100644 --- a/resources/latest/charts/istiod/files/kube-gateway.yaml +++ b/resources/latest/charts/istiod/files/kube-gateway.yaml @@ -3,6 +3,15 @@ kind: ServiceAccount metadata: name: {{.ServiceAccount | quote}} namespace: {{.Namespace | quote}} + annotations: + {{- toJsonMap (omit .InfrastructureAnnotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} + labels: + {{- toJsonMap + .InfrastructureLabels + (strdict + "gateway.networking.k8s.io/gateway-name" .Name + "istio.io/gateway-name" .Name + ) | nindent 4 }} --- apiVersion: apps/v1 kind: Deployment @@ -10,9 +19,14 @@ metadata: name: {{.DeploymentName | quote}} namespace: {{.Namespace | quote}} annotations: - {{- toJsonMap (omit .Annotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} + {{- toJsonMap (omit .InfrastructureAnnotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} labels: - {{- toJsonMap .Labels | nindent 4 }} + {{- toJsonMap + .InfrastructureLabels + (strdict + "gateway.networking.k8s.io/gateway-name" .Name + "istio.io/gateway-name" .Name + ) | nindent 4 }} ownerReferences: - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway @@ -21,12 +35,12 @@ metadata: spec: selector: matchLabels: - istio.io/gateway-name: {{.Name}} + "{{.GatewayNameLabel}}": {{.Name}} template: metadata: annotations: {{- toJsonMap - (omit .Annotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") + (omit .InfrastructureAnnotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") (strdict "istio.io/rev" (.Revision | default "default")) (strdict "prometheus.io/path" "/stats/prometheus" @@ -40,8 +54,11 @@ spec: "service.istio.io/canonical-name" .DeploymentName "service.istio.io/canonical-revision" "latest" ) - .Labels - (strdict "istio.io/gateway-name" .Name) | nindent 8}} + .InfrastructureLabels + (strdict + "gateway.networking.k8s.io/gateway-name" .Name + "istio.io/gateway-name" .Name + ) | nindent 8 }} spec: {{- if .KubeVersion122 }} {{/* safe since 1.22: https://github.com/kubernetes/kubernetes/pull/103326. */}} @@ -173,7 +190,7 @@ spec: fieldPath: spec.nodeName - name: ISTIO_META_INTERCEPTION_MODE value: "{{ .ProxyConfig.InterceptionMode.String }}" - {{- with (valueOrDefault (index .Labels "topology.istio.io/network") .Values.global.network) }} + {{- with (valueOrDefault (index .InfrastructureLabels "topology.istio.io/network") .Values.global.network) }} - name: ISTIO_META_NETWORK value: {{.|quote}} {{- end }} @@ -196,7 +213,7 @@ spec: - name: {{ $key }} value: "{{ $value }}" {{- end }} - {{- with (index .Labels "topology.istio.io/network") }} + {{- with (index .InfrastructureLabels "topology.istio.io/network") }} - name: ISTIO_META_REQUESTED_NETWORK_VIEW value: {{.|quote}} {{- end }} @@ -301,9 +318,14 @@ apiVersion: v1 kind: Service metadata: annotations: - {{ toJsonMap (omit .Annotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} + {{ toJsonMap (omit .InfrastructureAnnotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} labels: - {{ toJsonMap .Labels | nindent 4}} + {{- toJsonMap + .InfrastructureLabels + (strdict + "gateway.networking.k8s.io/gateway-name" .Name + "istio.io/gateway-name" .Name + ) | nindent 4 }} name: {{.DeploymentName | quote}} namespace: {{.Namespace | quote}} ownerReferences: @@ -320,7 +342,7 @@ spec: appProtocol: {{ $val.AppProtocol }} {{- end }} selector: - istio.io/gateway-name: {{.Name}} + "{{.GatewayNameLabel}}": {{.Name}} {{- if and (.Spec.Addresses) (eq .ServiceType "LoadBalancer") }} loadBalancerIP: {{ (index .Spec.Addresses 0).Value | quote}} {{- end }} diff --git a/resources/latest/charts/istiod/files/waypoint.yaml b/resources/latest/charts/istiod/files/waypoint.yaml index 51c63b720..531cdae67 100644 --- a/resources/latest/charts/istiod/files/waypoint.yaml +++ b/resources/latest/charts/istiod/files/waypoint.yaml @@ -3,6 +3,15 @@ kind: ServiceAccount metadata: name: {{.ServiceAccount | quote}} namespace: {{.Namespace | quote}} + annotations: + {{- toJsonMap (omit .InfrastructureAnnotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} + labels: + {{- toJsonMap + .InfrastructureLabels + (strdict + "gateway.networking.k8s.io/gateway-name" .Name + "istio.io/gateway-name" .Name + ) | nindent 4 }} --- apiVersion: apps/v1 kind: Deployment @@ -10,9 +19,15 @@ metadata: name: {{.DeploymentName | quote}} namespace: {{.Namespace | quote}} annotations: - {{- toJsonMap (omit .Annotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} + {{- toJsonMap (omit .InfrastructureAnnotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} labels: - {{- toJsonMap .Labels | nindent 4 }} + {{- toJsonMap + .InfrastructureLabels + (strdict + "gateway.networking.k8s.io/gateway-name" .Name + "istio.io/gateway-name" .Name + "gateway.istio.io/managed" "istio.io-mesh-controller" + ) | nindent 4 }} ownerReferences: - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway @@ -21,12 +36,12 @@ metadata: spec: selector: matchLabels: - istio.io/gateway-name: "{{.Name}}" + "{{.GatewayNameLabel}}": "{{.Name}}" template: metadata: annotations: {{- toJsonMap - (omit .Annotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") + (omit .InfrastructureAnnotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") (strdict "istio.io/rev" (.Revision | default "default")) (strdict "ambient.istio.io/redirection" "disabled" @@ -35,21 +50,15 @@ spec: "prometheus.io/scrape" "true" ) | nindent 8 }} labels: - {{- $requiredLabels := .Labels }} - {{- $network := valueOrDefault (index .Labels `topology.istio.io/network`) .Values.global.network }} - {{- if $network }} - {{- $requiredLabels = mergeMaps $requiredLabels (strdict - "topology.istio.io/network" $network - )}} - {{- end }} {{- toJsonMap (strdict "sidecar.istio.io/inject" "false" "service.istio.io/canonical-name" .DeploymentName "service.istio.io/canonical-revision" "latest" ) - $requiredLabels + .InfrastructureLabels (strdict + "gateway.networking.k8s.io/gateway-name" .Name "istio.io/gateway-name" .Name "gateway.istio.io/managed" "istio.io-mesh-controller" ) | nindent 8}} @@ -149,7 +158,7 @@ spec: resource: limits.cpu - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" - {{- $network := valueOrDefault (index .Labels `topology.istio.io/network`) .Values.global.network }} + {{- $network := valueOrDefault (index .InfrastructureLabels `topology.istio.io/network`) .Values.global.network }} {{- if $network }} - name: ISTIO_META_NETWORK value: "{{ $network }}" @@ -257,9 +266,14 @@ apiVersion: v1 kind: Service metadata: annotations: - {{ toJsonMap (omit .Annotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} + {{ toJsonMap (omit .InfrastructureAnnotations "kubectl.kubernetes.io/last-applied-configuration" "gateway.istio.io/name-override" "gateway.istio.io/service-account" "gateway.istio.io/controller-version") | nindent 4 }} labels: - {{ toJsonMap .Labels | nindent 4}} + {{- toJsonMap + .InfrastructureLabels + (strdict + "gateway.networking.k8s.io/gateway-name" .Name + "istio.io/gateway-name" .Name + ) | nindent 4 }} name: {{.DeploymentName | quote}} namespace: {{.Namespace | quote}} ownerReferences: @@ -276,7 +290,7 @@ spec: appProtocol: {{ $val.AppProtocol }} {{- end }} selector: - istio.io/gateway-name: "{{.Name}}" + "{{.GatewayNameLabel}}": "{{.Name}}" {{- if and (.Spec.Addresses) (eq .ServiceType "LoadBalancer") }} loadBalancerIP: {{ (index .Spec.Addresses 0).Value | quote}} {{- end }} diff --git a/resources/latest/charts/istiod/templates/autoscale.yaml b/resources/latest/charts/istiod/templates/autoscale.yaml index 44419fab5..c74f0ddbc 100644 --- a/resources/latest/charts/istiod/templates/autoscale.yaml +++ b/resources/latest/charts/istiod/templates/autoscale.yaml @@ -23,6 +23,12 @@ spec: resource: name: cpu targetAverageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }} + {{- if .Values.pilot.memory.targetAverageUtilization }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.pilot.memory.targetAverageUtilization }} + {{- end }} --- {{- else }} {{- if (semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion)}} @@ -54,6 +60,14 @@ spec: target: type: Utilization averageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }} + {{- if .Values.pilot.memory.targetAverageUtilization }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.pilot.memory.targetAverageUtilization }} + {{- end }} {{- if .Values.pilot.autoscaleBehavior }} behavior: {{ toYaml .Values.pilot.autoscaleBehavior | nindent 4 }} {{- end }} diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index 0b65ff55e..18e406a73 100644 --- a/resources/latest/charts/istiod/values.yaml +++ b/resources/latest/charts/istiod/values.yaml @@ -38,6 +38,8 @@ pilot: cpu: targetAverageUtilization: 80 + memory: {} + # targetAverageUtilization: 80 # Additional volumeMounts to the istiod container volumeMounts: [] @@ -239,7 +241,7 @@ global: # Dev builds from prow are on gcr.io hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 + tag: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb # 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 534d54291..570ed287e 100644 --- a/resources/latest/charts/ztunnel/Chart.yaml +++ b/resources/latest/charts/ztunnel/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +appVersion: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb 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.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +version: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index 7bc01df44..5369b2065 100644 --- a/resources/latest/charts/ztunnel/values.yaml +++ b/resources/latest/charts/ztunnel/values.yaml @@ -1,7 +1,7 @@ # 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.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492 +tag: 1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb # 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 dbf41107a..9ba8abdce 100644 --- a/versions.yaml +++ b/versions.yaml @@ -31,10 +31,10 @@ versions: latest: repo: https://github.com/istio/istio branch: master - commit: e113513e49106881b7a36336c8c6fcf33c173492 + commit: bebce9a0f1fbfe942e7f6664f2f0a03210175abb charts: - - https://storage.googleapis.com/istio-build/dev/1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492/helm/base-1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492.tgz - - https://storage.googleapis.com/istio-build/dev/1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492/helm/cni-1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492.tgz - - https://storage.googleapis.com/istio-build/dev/1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492/helm/gateway-1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492.tgz - - https://storage.googleapis.com/istio-build/dev/1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492/helm/istiod-1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492.tgz - - https://storage.googleapis.com/istio-build/dev/1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492/helm/ztunnel-1.21-alpha.e113513e49106881b7a36336c8c6fcf33c173492.tgz + - https://storage.googleapis.com/istio-build/dev/1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb/helm/base-1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb.tgz + - https://storage.googleapis.com/istio-build/dev/1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb/helm/cni-1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb.tgz + - https://storage.googleapis.com/istio-build/dev/1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb/helm/gateway-1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb.tgz + - https://storage.googleapis.com/istio-build/dev/1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb/helm/istiod-1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb.tgz + - https://storage.googleapis.com/istio-build/dev/1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb/helm/ztunnel-1.21-alpha.bebce9a0f1fbfe942e7f6664f2f0a03210175abb.tgz