From 5241b5d45e318ba9bbee36dc4e6ad8ef30935894 Mon Sep 17 00:00:00 2001 From: openshift-service-mesh-bot Date: Tue, 31 Dec 2024 05:05:29 +0000 Subject: [PATCH] Automator: Update dependencies in istio-ecosystem/sail-operator@main Signed-off-by: openshift-service-mesh-bot --- .devcontainer/devcontainer.json | 2 +- .github/workflows/update-deps.yaml | 2 +- Makefile.core.mk | 2 +- .../sailoperator.clusterserviceversion.yaml | 20 +++++++++---------- 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 ++-- .../charts/cni/templates/clusterrole.yaml | 2 +- .../charts/cni/templates/configmap-cni.yaml | 1 + resources/latest/charts/cni/values.yaml | 4 +++- resources/latest/charts/gateway/Chart.yaml | 4 ++-- .../charts/gateway/templates/deployment.yaml | 2 +- resources/latest/charts/istiod/Chart.yaml | 4 ++-- .../istiod/files/injection-template.yaml | 2 +- resources/latest/charts/istiod/values.yaml | 2 +- .../latest/charts/revisiontags/values.yaml | 2 +- resources/latest/charts/ztunnel/Chart.yaml | 4 ++-- .../latest/charts/ztunnel/templates/rbac.yaml | 2 +- resources/latest/charts/ztunnel/values.yaml | 2 +- versions.yaml | 14 ++++++------- 24 files changed, 53 insertions(+), 50 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7f057ea2..d888c9f2 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-0b8e6b9676d328fbeb28a23b8d1134dcc56d98ec", + "image": "gcr.io/istio-testing/build-tools:master-a45db55f6be0f98a625f52e3b58564dd1568b75b", "privileged": true, "remoteEnv": { "USE_GKE_GCLOUD_AUTH_PLUGIN": "True", diff --git a/.github/workflows/update-deps.yaml b/.github/workflows/update-deps.yaml index 98cf4831..58f2f726 100644 --- 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-0b8e6b9676d328fbeb28a23b8d1134dcc56d98ec + image: gcr.io/istio-testing/build-tools:master-a45db55f6be0f98a625f52e3b58564dd1568b75b options: --entrypoint '' steps: diff --git a/Makefile.core.mk b/Makefile.core.mk index a0d1295c..47bff8a9 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -477,7 +477,7 @@ HELM_VERSION ?= v3.16.4 CONTROLLER_TOOLS_VERSION ?= v0.16.5 OPM_VERSION ?= v1.49.0 OLM_VERSION ?= v0.30.0 -GITLEAKS_VERSION ?= v8.21.2 +GITLEAKS_VERSION ?= v8.22.1 ISTIOCTL_VERSION ?= 1.23.0 # GENERATE_RELATED_IMAGES defines whether `spec.relatedImages` is going to be generated or not diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index 888f50a8..cb7dde0a 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.3-latest - createdAt: "2024-12-19T05:05:23Z" + createdAt: "2024-12-31T05:05:24Z" description: Experimental operator for installing Istio service mesh features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -371,7 +371,7 @@ spec: - v1.22.6 - v1.22.5 - v1.21.6 - - latest (d547b858) + - latest (4bf40804) [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 @@ -647,10 +647,10 @@ spec: template: metadata: annotations: - images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea - images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea - images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea - images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea + images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 + images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 + images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 + images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 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 @@ -843,13 +843,13 @@ spec: provider: name: Red Hat, Inc. relatedImages: - - image: gcr.io/istio-testing/install-cni:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea + - image: gcr.io/istio-testing/install-cni:1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 name: latest.cni - - image: gcr.io/istio-testing/pilot:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea + - image: gcr.io/istio-testing/pilot:1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 name: latest.istiod - - image: gcr.io/istio-testing/proxyv2:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea + - image: gcr.io/istio-testing/proxyv2:1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 name: latest.proxy - - image: gcr.io/istio-testing/ztunnel:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea + - image: gcr.io/istio-testing/ztunnel:1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 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 index b7e608d0..ed3a87c5 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -28,7 +28,7 @@ csv: - v1.22.6 - v1.22.5 - v1.21.6 - - latest (d547b858) + - latest (4bf40804) [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 index 3df74a12..72514b18 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -ad4552bfdc5ead45c5d8084e4bf254b788090603 +f9c3ced054276bc926e2e9edb70958e3789da302 diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh index 82ab6249..951fc35f 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-0b8e6b9676d328fbeb28a23b8d1134dcc56d98ec + IMAGE_VERSION=master-a45db55f6be0f98a625f52e3b58564dd1568b75b fi if [[ "${IMAGE_NAME:-}" == "" ]]; then IMAGE_NAME=build-tools diff --git a/go.mod b/go.mod index 0cc6605f..4cd9e8cc 100644 --- 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.20241218215832-3daa0126820b - istio.io/istio v0.0.0-20241219014932-d547b8580cf6 + istio.io/client-go v1.24.0-alpha.0.0.20241230224854-69ee79ea2bf9 + istio.io/istio v0.0.0-20241230235559-4bf40804bb54 k8s.io/api v0.32.0 k8s.io/apiextensions-apiserver v0.32.0 k8s.io/apimachinery v0.32.0 @@ -167,7 +167,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.20241218215532-27d505cbdb11 // indirect + istio.io/api v1.24.0-alpha.0.0.20241227175049-13b0de17e700 // indirect k8s.io/apiserver v0.32.0 // indirect k8s.io/component-base v0.32.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect diff --git a/go.sum b/go.sum index 13fa41fe..6baf132d 100644 --- a/go.sum +++ b/go.sum @@ -494,12 +494,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.20241218215532-27d505cbdb11 h1:AlkTHCbrikiyS6Pz4Qke8+yXEOpgpC8kRMBaBClAIpg= -istio.io/api v1.24.0-alpha.0.0.20241218215532-27d505cbdb11/go.mod h1:QFzEXv/IT582T0FHZVp1QoolvE4ws0zz/vVO55blmlE= -istio.io/client-go v1.24.0-alpha.0.0.20241218215832-3daa0126820b h1:c8USLMmfK3eOUbQ4ut9nT4fnX48nx4mUc7q2AMu5Ppo= -istio.io/client-go v1.24.0-alpha.0.0.20241218215832-3daa0126820b/go.mod h1:SETUIw6SAGTLesSeed9N0SbW+72RoYB1J9LHuWgpMkQ= -istio.io/istio v0.0.0-20241219014932-d547b8580cf6 h1:HN+KGGjBUnAY/oAcuAJgZITuwIajFZdPYyxyefozmyg= -istio.io/istio v0.0.0-20241219014932-d547b8580cf6/go.mod h1:TiOIr/B86DoFGpimy1QGCrQbCT4XCJIbZ9fvs1mZ7AU= +istio.io/api v1.24.0-alpha.0.0.20241227175049-13b0de17e700 h1:NvJAN4Dx8iP483WavnfUnNleyowuWuW6iI2NZpXe0S4= +istio.io/api v1.24.0-alpha.0.0.20241227175049-13b0de17e700/go.mod h1:QFzEXv/IT582T0FHZVp1QoolvE4ws0zz/vVO55blmlE= +istio.io/client-go v1.24.0-alpha.0.0.20241230224854-69ee79ea2bf9 h1:GslOUSyTUIgMe91SFASJ5T/5oZgTqlxqxY1zPnnF76w= +istio.io/client-go v1.24.0-alpha.0.0.20241230224854-69ee79ea2bf9/go.mod h1:0evkg1ZYxM6xXSg3ABHBFV2lm5N+ZfPzOfGkNRrQlkw= +istio.io/istio v0.0.0-20241230235559-4bf40804bb54 h1:bgL6ifIw53vCzo+G9eXSOxgSLXzoSGLXEPvV0r0bYhQ= +istio.io/istio v0.0.0-20241230235559-4bf40804bb54/go.mod h1:TiOIr/B86DoFGpimy1QGCrQbCT4XCJIbZ9fvs1mZ7AU= 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/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index 360100c6..5ac7bdbb 100644 --- a/resources/latest/charts/base/Chart.yaml +++ b/resources/latest/charts/base/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea +appVersion: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 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.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea +version: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index 7dff0306..08dee556 100644 --- a/resources/latest/charts/cni/Chart.yaml +++ b/resources/latest/charts/cni/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea +appVersion: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 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.d547b8580cf6298e15ba732823b2e027071516ea +version: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 diff --git a/resources/latest/charts/cni/templates/clusterrole.yaml b/resources/latest/charts/cni/templates/clusterrole.yaml index bd9ba7fd..a51cd782 100644 --- a/resources/latest/charts/cni/templates/clusterrole.yaml +++ b/resources/latest/charts/cni/templates/clusterrole.yaml @@ -18,7 +18,7 @@ rules: - apiGroups: [""] resources: ["pods","nodes","namespaces"] verbs: ["get", "list", "watch"] -{{- if (eq (coalesce .Values.platform .Values.global.platform) "openshift") }} +{{- if (eq ((coalesce .Values.platform .Values.global.platform) | default "") "openshift") }} - apiGroups: ["security.openshift.io"] resources: ["securitycontextconstraints"] resourceNames: ["privileged"] diff --git a/resources/latest/charts/cni/templates/configmap-cni.yaml b/resources/latest/charts/cni/templates/configmap-cni.yaml index 39a09fb6..2c2bfe57 100644 --- a/resources/latest/charts/cni/templates/configmap-cni.yaml +++ b/resources/latest/charts/cni/templates/configmap-cni.yaml @@ -16,6 +16,7 @@ data: AMBIENT_ENABLED: {{ .Values.ambient.enabled | quote }} AMBIENT_DNS_CAPTURE: {{ .Values.ambient.dnsCapture | default "false" | quote }} AMBIENT_IPV6: {{ .Values.ambient.ipv6 | default "false" | quote }} + AMBIENT_RECONCILE_POD_RULES_ON_STARTUP: {{ .Values.ambient.reconcileIptablesOnStartup | default "false" | quote }} {{- if .Values.cniConfFileName }} # K8S < 1.24 doesn't like empty values CNI_CONF_NAME: {{ .Values.cniConfFileName }} # Name of the CNI config file to create. Only override if you know the exact path your CNI requires.. {{- end }} diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index bbcd96e2..f6336648 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -51,6 +51,8 @@ _internal_defaults_do_not_set: dnsCapture: false # If enabled, and ambient is enabled, enables ipv6 support ipv6: true + # If enabled, and ambient is enabled, the CNI agent will reconcile incompatible iptables rules and chains at startup. + reconcileIptablesOnStartup: false repair: @@ -113,7 +115,7 @@ _internal_defaults_do_not_set: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea + tag: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 # 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 2f588819..f301246f 100644 --- a/resources/latest/charts/gateway/Chart.yaml +++ b/resources/latest/charts/gateway/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea +appVersion: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 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.d547b8580cf6298e15ba732823b2e027071516ea +version: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 diff --git a/resources/latest/charts/gateway/templates/deployment.yaml b/resources/latest/charts/gateway/templates/deployment.yaml index e9bfbbd3..9db59d8b 100644 --- a/resources/latest/charts/gateway/templates/deployment.yaml +++ b/resources/latest/charts/gateway/templates/deployment.yaml @@ -77,7 +77,7 @@ spec: allowPrivilegeEscalation: false privileged: false readOnlyRootFilesystem: true - {{- if not (eq .Values.platform "openshift") }} + {{- if not (eq (.Values.platform | default "") "openshift") }} runAsUser: 1337 runAsGroup: 1337 {{- end }} diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index 3e0c4d7e..36d6eb05 100644 --- a/resources/latest/charts/istiod/Chart.yaml +++ b/resources/latest/charts/istiod/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea +appVersion: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 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.d547b8580cf6298e15ba732823b2e027071516ea +version: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 diff --git a/resources/latest/charts/istiod/files/injection-template.yaml b/resources/latest/charts/istiod/files/injection-template.yaml index 93eafdac..3b3f69cd 100644 --- a/resources/latest/charts/istiod/files/injection-template.yaml +++ b/resources/latest/charts/istiod/files/injection-template.yaml @@ -52,7 +52,7 @@ metadata: sidecar.istio.io/interceptionMode: "{{ annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode }}", {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/includeOutboundIPRanges` .Values.global.proxy.includeIPRanges }}traffic.sidecar.istio.io/includeOutboundIPRanges: "{{.}}",{{ end }} {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/excludeOutboundIPRanges` .Values.global.proxy.excludeIPRanges }}traffic.sidecar.istio.io/excludeOutboundIPRanges: "{{.}}",{{ end }} - {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/includeInboundPorts` .Values.global.proxy.includeInboundPorts }}traffic.sidecar.istio.io/includeInboundPorts: "{{.}}",{{ end }} + traffic.sidecar.istio.io/includeInboundPorts: "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/includeInboundPorts` .Values.global.proxy.includeInboundPorts }}", traffic.sidecar.istio.io/excludeInboundPorts: "{{ excludeInboundPort (annotation .ObjectMeta `status.sidecar.istio.io/port` .Values.global.proxy.statusPort) (annotation .ObjectMeta `traffic.sidecar.istio.io/excludeInboundPorts` .Values.global.proxy.excludeInboundPorts) }}", {{ if or (isset .ObjectMeta.Annotations `traffic.sidecar.istio.io/includeOutboundPorts`) (ne (valueOrDefault .Values.global.proxy.includeOutboundPorts "") "") }} traffic.sidecar.istio.io/includeOutboundPorts: "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/includeOutboundPorts` .Values.global.proxy.includeOutboundPorts }}", diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index f359aa8e..32cb3f9a 100644 --- 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.d547b8580cf6298e15ba732823b2e027071516ea + tag: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 # 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 index f359aa8e..32cb3f9a 100644 --- 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.d547b8580cf6298e15ba732823b2e027071516ea + tag: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 # 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 387b012f..70f40980 100644 --- a/resources/latest/charts/ztunnel/Chart.yaml +++ b/resources/latest/charts/ztunnel/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea +appVersion: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 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.d547b8580cf6298e15ba732823b2e027071516ea +version: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 diff --git a/resources/latest/charts/ztunnel/templates/rbac.yaml b/resources/latest/charts/ztunnel/templates/rbac.yaml index 21b0e8de..3b90cf5a 100644 --- a/resources/latest/charts/ztunnel/templates/rbac.yaml +++ b/resources/latest/charts/ztunnel/templates/rbac.yaml @@ -21,7 +21,7 @@ metadata: {{- .Values.annotations | toYaml | nindent 4 }} {{- end }} --- -{{- if (eq .Values.platform "openshift") }} +{{- if (eq (.Values.platform | default "") "openshift") }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index 5c8b9bd6..6498937e 100644 --- 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.d547b8580cf6298e15ba732823b2e027071516ea + tag: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 # 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 4dbc419f..9ccb6950 100644 --- 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.d547b8580cf6298e15ba732823b2e027071516ea + version: 1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4 repo: https://github.com/istio/istio branch: master - commit: d547b8580cf6298e15ba732823b2e027071516ea + commit: 4bf40804bb54612f6e1a30b560a0d2d61f5846e4 charts: - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/base-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/cni-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/gateway-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/istiod-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/ztunnel-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4/helm/base-1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4/helm/cni-1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4/helm/gateway-1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4/helm/istiod-1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4/helm/ztunnel-1.25-alpha.4bf40804bb54612f6e1a30b560a0d2d61f5846e4.tgz