From e6155da6be78f7167103c6327966d194653c2320 Mon Sep 17 00:00:00 2001 From: openshift-service-mesh-bot <165402251+openshift-service-mesh-bot@users.noreply.github.com> Date: Tue, 15 Oct 2024 07:18:28 +0200 Subject: [PATCH] Automator: Update dependencies in istio-ecosystem/sail-operator@main (#421) Signed-off-by: openshift-service-mesh-bot --- Makefile.core.mk | 2 +- .../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 ++-- .../charts/cni/templates/daemonset.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 | 14 ++++++------- 15 files changed, 39 insertions(+), 35 deletions(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index 9007df9ae..52c4b5dce 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -472,7 +472,7 @@ OPERATOR_SDK_VERSION ?= v1.37.0 HELM_VERSION ?= v3.16.2 CONTROLLER_TOOLS_VERSION ?= v0.16.4 OPM_VERSION ?= v1.47.0 -GITLEAKS_VERSION ?= v8.20.1 +GITLEAKS_VERSION ?= v8.21.0 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 483493b67..be364f9c9 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-13T05:20:21Z" + createdAt: "2024-10-15T05:04:53Z" description: Experimental operator for installing Istio service mesh features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -374,7 +374,7 @@ spec: - v1.23.2 - v1.22.5 - v1.21.6 - - latest (e3b7c36c) + - latest (358edc01) [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 @@ -598,10 +598,10 @@ spec: template: metadata: annotations: - images.latest.cni: gcr.io/istio-testing/install-cni:1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a - images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a - images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a - images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + images.latest.cni: gcr.io/istio-testing/install-cni:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 + images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 + images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 + images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + - image: gcr.io/istio-testing/install-cni:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 name: latest.cni - - image: gcr.io/istio-testing/pilot:1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + - image: gcr.io/istio-testing/pilot:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 name: latest.istiod - - image: gcr.io/istio-testing/proxyv2:1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + - image: gcr.io/istio-testing/proxyv2:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 name: latest.proxy - - image: gcr.io/istio-testing/ztunnel:1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + - image: gcr.io/istio-testing/ztunnel:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 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 47c9713e3..6b7cd39ec 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -21,7 +21,7 @@ csv: - v1.23.2 - v1.22.5 - v1.21.6 - - latest (e3b7c36c) + - latest (358edc01) [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 e6465dc85..149e20cff 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.23.0-alpha.0.0.20241011000732-f46eea8919cd - istio.io/istio v0.0.0-20241013024925-e3b7c36c24a0 + istio.io/istio v0.0.0-20241015000627-358edc01a5ab 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 398bc3338..b1d744f0b 100644 --- a/go.sum +++ b/go.sum @@ -493,8 +493,8 @@ istio.io/api v1.23.0-alpha.0.0.20241011000314-650491578381 h1:ZgYTwI0GqRLuany0gL istio.io/api v1.23.0-alpha.0.0.20241011000314-650491578381/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I= istio.io/client-go v1.23.0-alpha.0.0.20241011000732-f46eea8919cd h1:rghOYcynTAXYGRJXkZjxAogTbNQE+ROTWPaGTcd84bM= istio.io/client-go v1.23.0-alpha.0.0.20241011000732-f46eea8919cd/go.mod h1:oECxINJDBsN7AtQjcZVBQqQ73FHeYw6D3ihspfN7PDs= -istio.io/istio v0.0.0-20241013024925-e3b7c36c24a0 h1:ComuULtR/m4OSUNqedc0mtjwQyv+yrf0tIhfMTXLRT4= -istio.io/istio v0.0.0-20241013024925-e3b7c36c24a0/go.mod h1:OjXgkrdrI5myoxr0eDxoWm+q5kFrcgLNlJLRvGd5ZIk= +istio.io/istio v0.0.0-20241015000627-358edc01a5ab h1:ASlKPnedbweaDwTCV2MkU35LECx+jJAALl36uRo04Vk= +istio.io/istio v0.0.0-20241015000627-358edc01a5ab/go.mod h1:OjXgkrdrI5myoxr0eDxoWm+q5kFrcgLNlJLRvGd5ZIk= 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 5ae6db26a..7dedcf2da 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +appVersion: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +version: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index 755e5665c..facd79f88 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +appVersion: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +version: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 diff --git a/resources/latest/charts/cni/templates/daemonset.yaml b/resources/latest/charts/cni/templates/daemonset.yaml index 35cae7cb1..659ba26f3 100644 --- a/resources/latest/charts/cni/templates/daemonset.yaml +++ b/resources/latest/charts/cni/templates/daemonset.yaml @@ -111,6 +111,10 @@ spec: # network namespaces in `/proc` to obtain descriptors for entering pod network # namespaces. There does not appear to be a more granular capability for this. - SYS_ADMIN +{{- if .Values.seLinuxOptions }} + seLinuxOptions: +{{ toYaml .Values.seLinuxOptions | trim | indent 14 }} +{{- end }} {{- if .Values.seccompProfile }} seccompProfile: {{ toYaml .Values.seccompProfile | trim | indent 14 }} diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index 59ae974e7..117be557b 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -112,7 +112,7 @@ _internal_defaults_do_not_set: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + tag: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 # 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 58b92289f..464a101ba 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +appVersion: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +version: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index f32570f20..3609ffcc6 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +appVersion: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +version: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index 7798b152f..8f575aba1 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + tag: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 # 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 f59255b61..16693702b 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +appVersion: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a +version: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index 1a0d99911..660ac629a 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + tag: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 # 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 379a14a26..9f0e9e41f 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.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + version: 1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 repo: https://github.com/istio/istio branch: master - commit: e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a + commit: 358edc01a5abb53259ad1637a63d7562b040a6f1 charts: - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a/helm/base-1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a.tgz - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a/helm/cni-1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a.tgz - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a/helm/gateway-1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a.tgz - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a/helm/istiod-1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a.tgz - - https://storage.googleapis.com/istio-build/dev/1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a/helm/ztunnel-1.24-alpha.e3b7c36c24a0b9047adb25906c4eaf8d1e8e752a.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1/helm/base-1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1/helm/cni-1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1/helm/gateway-1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1/helm/istiod-1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1/helm/ztunnel-1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1.tgz