diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2c76a3164..4c23ac636 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-e1fcc89d18dcbddd83c4934416e5b8b6faa09691", + "image": "gcr.io/istio-testing/build-tools:master-5febdc9ef2a2e05a9451ced0db096b4ecefd2a64", "privileged": true, "remoteEnv": { "USE_GKE_GCLOUD_AUTH_PLUGIN": "True", diff --git a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml index f8771d8ae..6423dc3fc 100644 --- a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml +++ b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml @@ -34,7 +34,7 @@ metadata: capabilities: Seamless Upgrades categories: OpenShift Optional, Integration & Delivery, Networking, Security containerImage: quay.io/maistra-dev/sail-operator:3.0.0-tp-latest - createdAt: "2024-05-14T08:52:09Z" + createdAt: "2024-05-14T21:06:02Z" description: The OpenShift Service Mesh Operator enables you to install, configure, and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service Mesh is based on the open source Istio project. diff --git a/chart/values.yaml b/chart/values.yaml index c278596cc..15cba4926 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -18,7 +18,7 @@ csv: - v1.21.2 - v1.21.0 - - latest (f4d07793) + - latest (76d03ee7) [See this page](https://github.com/istio-ecosystem/sail-operator/blob/pre-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 472d692e2..7e608852b 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -cf3ae8349d9720b56c625439c3f6a4c7c5b60f82 +23ecf28729c3020e9c62e9d585bace6d95fbaac4 diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh index 5b87f16a1..45726cd92 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-e1fcc89d18dcbddd83c4934416e5b8b6faa09691 + IMAGE_VERSION=master-5febdc9ef2a2e05a9451ced0db096b4ecefd2a64 fi if [[ "${IMAGE_NAME:-}" == "" ]]; then IMAGE_NAME=build-tools diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index f3ce4244e..75c6cd83a 100644 --- a/resources/latest/charts/base/Chart.yaml +++ b/resources/latest/charts/base/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 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.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +version: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index f66911eb1..dded740ef 100644 --- a/resources/latest/charts/cni/Chart.yaml +++ b/resources/latest/charts/cni/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 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.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +version: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index 7b9084628..f63630830 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -112,7 +112,7 @@ defaults: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 + tag: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 # 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 81003ffe6..206aeea6f 100644 --- a/resources/latest/charts/gateway/Chart.yaml +++ b/resources/latest/charts/gateway/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 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.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +version: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index 8dbdd3e9e..9ac5d2753 100644 --- a/resources/latest/charts/istiod/Chart.yaml +++ b/resources/latest/charts/istiod/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 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.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +version: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index 2442f4370..5cd10caab 100644 --- a/resources/latest/charts/istiod/values.yaml +++ b/resources/latest/charts/istiod/values.yaml @@ -234,7 +234,7 @@ defaults: # Dev builds from prow are on gcr.io hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 + tag: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 # 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 08029ed7c..57b00d20f 100644 --- a/resources/latest/charts/ztunnel/Chart.yaml +++ b/resources/latest/charts/ztunnel/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +appVersion: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 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.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 +version: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 diff --git a/resources/latest/charts/ztunnel/templates/daemonset.yaml b/resources/latest/charts/ztunnel/templates/daemonset.yaml index 5d600d3cc..ddaacbb5e 100644 --- a/resources/latest/charts/ztunnel/templates/daemonset.yaml +++ b/resources/latest/charts/ztunnel/templates/daemonset.yaml @@ -28,6 +28,13 @@ spec: spec: nodeSelector: kubernetes.io/os: linux +{{- if .Values.nodeSelector }} +{{ toYaml .Values.nodeSelector | indent 8 }} +{{- end }} +{{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | trim | indent 8 }} +{{- end }} serviceAccountName: ztunnel tolerations: - effect: NoSchedule diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index fa78ece3b..e10dfb3b5 100644 --- a/resources/latest/charts/ztunnel/values.yaml +++ b/resources/latest/charts/ztunnel/values.yaml @@ -2,7 +2,7 @@ defaults: # 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.23-alpha.f4d0779389cb4e451d3184296b54560110794f93 + tag: 1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638 # 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 6107cc043..0f0423320 100644 --- a/versions.yaml +++ b/versions.yaml @@ -34,10 +34,10 @@ versions: version: 1.23-alpha repo: https://github.com/istio/istio branch: master - commit: f4d0779389cb4e451d3184296b54560110794f93 + commit: 76d03ee78276eef8ca8068698e7e2106f31a3638 charts: - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93/helm/base-1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93/helm/cni-1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93/helm/gateway-1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93/helm/istiod-1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93/helm/ztunnel-1.23-alpha.f4d0779389cb4e451d3184296b54560110794f93.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/base-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/cni-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/gateway-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/istiod-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638/helm/ztunnel-1.23-alpha.76d03ee78276eef8ca8068698e7e2106f31a3638.tgz