diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index 7e5fec9bc..6502e32a9 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-11-20T05:05:08Z" + createdAt: "2024-11-21T05:05:41Z" description: Experimental operator for installing Istio service mesh features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -315,7 +315,7 @@ spec: - v1.22.6 - v1.22.5 - v1.21.6 - - latest (944617cd) + - latest (f66b1fb7) [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 @@ -539,10 +539,10 @@ spec: template: metadata: annotations: - images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 - images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 - images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 - images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 + images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 + images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 + images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 + images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 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 @@ -719,13 +719,13 @@ spec: provider: name: Red Hat, Inc. relatedImages: - - image: gcr.io/istio-testing/install-cni:1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 + - image: gcr.io/istio-testing/install-cni:1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 name: latest.cni - - image: gcr.io/istio-testing/pilot:1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 + - image: gcr.io/istio-testing/pilot:1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 name: latest.istiod - - image: gcr.io/istio-testing/proxyv2:1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 + - image: gcr.io/istio-testing/proxyv2:1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 name: latest.proxy - - image: gcr.io/istio-testing/ztunnel:1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 + - image: gcr.io/istio-testing/ztunnel:1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 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 0b2ee43fe..27145ffbc 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -24,7 +24,7 @@ csv: - v1.22.6 - v1.22.5 - v1.21.6 - - latest (944617cd) + - latest (f66b1fb7) [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 e4cda6c45..d3338faf4 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.20241119093757-67284b50ebaf - istio.io/istio v0.0.0-20241120001605-944617cd8991 + istio.io/client-go v1.24.0-alpha.0.0.20241120163259-29f2caac2edb + istio.io/istio v0.0.0-20241121003659-f66b1fb747a1 k8s.io/api v0.31.2 k8s.io/apiextensions-apiserver v0.31.2 k8s.io/apimachinery v0.31.2 @@ -169,7 +169,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.20241119093358-f27f8e964442 // indirect + istio.io/api v1.24.0-alpha.0.0.20241120162859-fae8de666daf // indirect k8s.io/apiserver v0.31.2 // indirect k8s.io/component-base v0.31.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect diff --git a/go.sum b/go.sum index 924804da2..2b7e192d5 100644 --- a/go.sum +++ b/go.sum @@ -495,12 +495,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.20241119093358-f27f8e964442 h1:D/xiBtMK4eyS4Xjhp8eGy1KZhpiGIePRvMpd8UHVRsI= -istio.io/api v1.24.0-alpha.0.0.20241119093358-f27f8e964442/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I= -istio.io/client-go v1.24.0-alpha.0.0.20241119093757-67284b50ebaf h1:o49zxbZNso4i133UYjuFp+xOg8LUirhNBFYd1kpr99I= -istio.io/client-go v1.24.0-alpha.0.0.20241119093757-67284b50ebaf/go.mod h1:pqM8LKBe54lvudw5Eu8itc+rlWsIZUksrdYCBTPqang= -istio.io/istio v0.0.0-20241120001605-944617cd8991 h1:hE7nvGJJj1v/byMG/EPOEWCAMH5h768lnXMBtGdYo/E= -istio.io/istio v0.0.0-20241120001605-944617cd8991/go.mod h1:FtmeFzmXiB4F+TF1Jm/vCbmWhDQKX+Dp37LQhg2kXaM= +istio.io/api v1.24.0-alpha.0.0.20241120162859-fae8de666daf h1:zTdyQkhjN+P/YyNEPLgVUqzJZ/jjH/2q04aHbwih8ig= +istio.io/api v1.24.0-alpha.0.0.20241120162859-fae8de666daf/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I= +istio.io/client-go v1.24.0-alpha.0.0.20241120163259-29f2caac2edb h1:ArcXYEPt3B4X6Kn6UnLnNdrzBgQ3JUf1JaTiIXhPVJg= +istio.io/client-go v1.24.0-alpha.0.0.20241120163259-29f2caac2edb/go.mod h1:vte206DqClVmCNU1qtUvHnTZ3/fCqN7V4HJ3mVR1/Ok= +istio.io/istio v0.0.0-20241121003659-f66b1fb747a1 h1:8615Y0Dzil49cMtFYFKjSfxw9EKbPfP104CSQdlbOUU= +istio.io/istio v0.0.0-20241121003659-f66b1fb747a1/go.mod h1:lMCNS3beHn/9nZScE1gl55yQsfeXSRHi2/bfFj7lqHA= k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0= diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index 1bc5d7ae1..fb2bf469f 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +appVersion: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +version: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index 96085667c..bcc3344d3 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +appVersion: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +version: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index d58403cdb..8fd3fa1c4 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.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7 + tag: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 # 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 97b660f4a..581dd150f 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +appVersion: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +version: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index 36210be90..c915e8e89 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +appVersion: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +version: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 diff --git a/resources/latest/charts/istiod/templates/serviceaccount.yaml b/resources/latest/charts/istiod/templates/serviceaccount.yaml index 22b841e87..a673a4d07 100644 --- a/resources/latest/charts/istiod/templates/serviceaccount.yaml +++ b/resources/latest/charts/istiod/templates/serviceaccount.yaml @@ -18,7 +18,7 @@ metadata: {{- include "istio.labels" . | nindent 4 }} {{- if .Values.serviceAccountAnnotations }} annotations: -{{- toYaml .Values.serviceAccountAnnotations | indent 4 }} +{{- toYaml .Values.serviceAccountAnnotations | nindent 4 }} {{- end }} {{- end }} --- diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index 3ae0e5a4c..2de23e42e 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.944617cd8991f46294da2de8c0117f426d3b3fb7 + tag: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 # 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 7f5ab7e08..01a0fa70a 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +appVersion: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 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.944617cd8991f46294da2de8c0117f426d3b3fb7 +version: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index dc8f73fc4..612d3d3ac 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.944617cd8991f46294da2de8c0117f426d3b3fb7 + tag: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 # 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 b427eb24a..6e1656d6a 100644 --- a/versions.yaml +++ b/versions.yaml @@ -74,13 +74,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.944617cd8991f46294da2de8c0117f426d3b3fb7 + version: 1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2 repo: https://github.com/istio/istio branch: master - commit: 944617cd8991f46294da2de8c0117f426d3b3fb7 + commit: f66b1fb747a1ca7587442f39c7bb591198b48dd2 charts: - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7/helm/base-1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7.tgz - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7/helm/cni-1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7.tgz - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7/helm/gateway-1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7.tgz - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7/helm/istiod-1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7.tgz - - https://storage.googleapis.com/istio-build/dev/1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7/helm/ztunnel-1.25-alpha.944617cd8991f46294da2de8c0117f426d3b3fb7.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2/helm/base-1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2/helm/cni-1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2/helm/gateway-1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2/helm/istiod-1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2.tgz + - https://storage.googleapis.com/istio-build/dev/1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2/helm/ztunnel-1.25-alpha.f66b1fb747a1ca7587442f39c7bb591198b48dd2.tgz