From 7476b219583325e736107715f273ac1d235f67da Mon Sep 17 00:00:00 2001 From: openshift-service-mesh-bot Date: Tue, 22 Oct 2024 05:19:54 +0000 Subject: [PATCH] Automator: Update dependencies in istio-ecosystem/sail-operator@main Signed-off-by: openshift-service-mesh-bot --- .../sailoperator.clusterserviceversion.yaml | 20 +++++++++---------- chart/values.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- 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 ++-- .../latest/charts/istiod/files/waypoint.yaml | 10 ++++++++-- .../charts/istiod/templates/deployment.yaml | 2 +- resources/latest/charts/istiod/values.yaml | 2 +- resources/latest/charts/ztunnel/Chart.yaml | 4 ++-- resources/latest/charts/ztunnel/values.yaml | 2 +- versions.yaml | 14 ++++++------- 15 files changed, 43 insertions(+), 37 deletions(-) diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index 8fcddf762..74c2f7b4b 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.2-latest - createdAt: "2024-10-20T05:05:02Z" + createdAt: "2024-10-22T05:19:51Z" description: Experimental operator for installing Istio service mesh features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -375,7 +375,7 @@ spec: - v1.23.2 - v1.22.5 - v1.21.6 - - latest (0bcbad8c) + - latest (ec2e6252) [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 @@ -599,10 +599,10 @@ spec: template: metadata: annotations: - images.latest.cni: gcr.io/istio-testing/install-cni:1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e - images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e - images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e - images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + images.latest.cni: gcr.io/istio-testing/install-cni:1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde + images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde + images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde + images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde 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 @@ -767,13 +767,13 @@ spec: provider: name: Red Hat, Inc. relatedImages: - - image: gcr.io/istio-testing/install-cni:1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + - image: gcr.io/istio-testing/install-cni:1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde name: latest.cni - - image: gcr.io/istio-testing/pilot:1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + - image: gcr.io/istio-testing/pilot:1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde name: latest.istiod - - image: gcr.io/istio-testing/proxyv2:1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + - image: gcr.io/istio-testing/proxyv2:1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde name: latest.proxy - - image: gcr.io/istio-testing/ztunnel:1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + - image: gcr.io/istio-testing/ztunnel:1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde 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 9707ca57e..5a00446f5 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -21,7 +21,7 @@ csv: - v1.23.2 - v1.22.5 - v1.21.6 - - latest (0bcbad8c) + - latest (ec2e6252) [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/go.mod b/go.mod index c1f36273a..21f793fef 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.16.1 istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6 - istio.io/istio v0.0.0-20241020024853-0bcbad8cac80 + istio.io/istio v0.0.0-20241022021630-ec2e62526733 k8s.io/api v0.31.1 k8s.io/apiextensions-apiserver v0.31.1 k8s.io/apimachinery v0.31.1 diff --git a/go.sum b/go.sum index fed332198..bc30531a2 100644 --- a/go.sum +++ b/go.sum @@ -493,8 +493,8 @@ istio.io/api v1.24.0-alpha.0.0.20241018201654-7c8ec5b5ab72 h1:AVg/4p5sVhZT6JwBcz istio.io/api v1.24.0-alpha.0.0.20241018201654-7c8ec5b5ab72/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I= istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6 h1:qVjgBbqg19vZCpeTMQR0QM8SRfLZTtaSXgWbnWRb0fo= istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6/go.mod h1:usBQZ/vvpGAUA6yGiz6x9ufG50gRC9v0332MesA/lNw= -istio.io/istio v0.0.0-20241020024853-0bcbad8cac80 h1:Vup2WLdzuK85LX74Bov3KweTUT4DO1C7nshvjZOX/H0= -istio.io/istio v0.0.0-20241020024853-0bcbad8cac80/go.mod h1:HIYMYxUxROUbBMwgNfV6QmZmVBn2soLee2eigSAMCbM= +istio.io/istio v0.0.0-20241022021630-ec2e62526733 h1:cdU+BxXv4/OUe9CPHxqOVQit5D9+Ua5zKSC7WOCRk9g= +istio.io/istio v0.0.0-20241022021630-ec2e62526733/go.mod h1:HIYMYxUxROUbBMwgNfV6QmZmVBn2soLee2eigSAMCbM= k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index 5a207d3a0..ece32c81e 100644 --- a/resources/latest/charts/base/Chart.yaml +++ b/resources/latest/charts/base/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +appVersion: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde 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.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +version: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index a59496656..86340cef9 100644 --- a/resources/latest/charts/cni/Chart.yaml +++ b/resources/latest/charts/cni/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +appVersion: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde 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.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +version: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index d7c5ea8a2..1e261d41b 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -115,7 +115,7 @@ _internal_defaults_do_not_set: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + tag: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde # 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 4aeede188..d639f6153 100644 --- a/resources/latest/charts/gateway/Chart.yaml +++ b/resources/latest/charts/gateway/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +appVersion: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde 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.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +version: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index e437d0739..4f7d699a4 100644 --- a/resources/latest/charts/istiod/Chart.yaml +++ b/resources/latest/charts/istiod/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +appVersion: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde 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.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +version: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde diff --git a/resources/latest/charts/istiod/files/waypoint.yaml b/resources/latest/charts/istiod/files/waypoint.yaml index 1671af533..bbe47674b 100644 --- a/resources/latest/charts/istiod/files/waypoint.yaml +++ b/resources/latest/charts/istiod/files/waypoint.yaml @@ -294,10 +294,16 @@ apiVersion: v1 kind: Service metadata: 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 }} + {{ toJsonMap + (strdict "networking.istio.io/traffic-distribution" "PreferClose") + (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 - (strdict "networking.istio.io/traffic-distribution" "PreferClose") .InfrastructureLabels (strdict "gateway.networking.k8s.io/gateway-name" .Name diff --git a/resources/latest/charts/istiod/templates/deployment.yaml b/resources/latest/charts/istiod/templates/deployment.yaml index 2e07d1233..560933b51 100644 --- a/resources/latest/charts/istiod/templates/deployment.yaml +++ b/resources/latest/charts/istiod/templates/deployment.yaml @@ -186,7 +186,7 @@ spec: # If externalIstiod is set via Values.Global, then enable the pilot env variable. However, if it's set via Values.pilot.env, then # don't set it here to avoid duplication. # TODO (nshankar13): Move from Helm chart to code: https://github.com/istio/istio/issues/52449 -{{- if and .Values.global.externalIstiod (not (and .Values.pilot.env .Values.pilot.env.EXTERNAL_ISTIOD)) }} +{{- if and .Values.global.externalIstiod (not (and .Values.env .Values.env.EXTERNAL_ISTIOD)) }} - name: EXTERNAL_ISTIOD value: "{{ .Values.global.externalIstiod }}" {{- end }} diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index 0c0a76293..5e250ad48 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.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + tag: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde # 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 93f716031..18f843baa 100644 --- a/resources/latest/charts/ztunnel/Chart.yaml +++ b/resources/latest/charts/ztunnel/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +appVersion: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde 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.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e +version: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index c7c48f9ab..18002436a 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.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + tag: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde # 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 1c97c525d..4b6b86af7 100644 --- a/versions.yaml +++ b/versions.yaml @@ -43,13 +43,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.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e + version: 1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde repo: https://github.com/istio/istio branch: master - commit: 0bcbad8cac80a1a50da64ab398f71410308c792e + commit: ec2e62526733486e241640b69789cd4a145ecbde charts: - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e/helm/base-1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e.tgz - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e/helm/cni-1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e.tgz - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e/helm/gateway-1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e.tgz - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e/helm/istiod-1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e.tgz - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e/helm/ztunnel-1.24-alpha.0bcbad8cac80a1a50da64ab398f71410308c792e.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/base-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/cni-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/gateway-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/istiod-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/ztunnel-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz