From 19848b8913140d259058b822f6f3b0c137c021d1 Mon Sep 17 00:00:00 2001 From: Sridhar Gaddam Date: Mon, 24 Jun 2024 18:15:30 +0530 Subject: [PATCH 1/3] Include steps to create istio-cni ns when missing (#174) Signed-off-by: Sridhar Gaddam --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0d501de90..eb88a7b91 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,8 @@ kubectl apply -f chart/samples/istio-sample-openshift.yaml On OpenShift, you must also deploy the Istio CNI plugin by creating an instance of the `IstioCNI` resource: ```sh +# Create the istio-cni namespace if it does not exist +kubectl get ns istio-cni || kubectl create ns istio-cni kubectl apply -f chart/samples/istiocni-sample.yaml ``` From df42d5aa87dbee38b19414c95775bc14f1712996 Mon Sep 17 00:00:00 2001 From: Sridhar Gaddam Date: Mon, 24 Jun 2024 23:58:30 +0530 Subject: [PATCH 2/3] Fix minor typos in e2e readme file (#176) Signed-off-by: Sridhar Gaddam --- tests/e2e/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 88ea05b66..7a88b02e1 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -2,7 +2,7 @@ This end-to-end test suite utilizes Ginkgo, a testing framework known for its expressive specs (reference: https://onsi.github.io/ginkgo/). The setup for the test run is similar to the upstream Istio integration tests: * In the case of kind execution, it relies on the upstream script [`kind_provisioner.sh`](https://github.com/istio-ecosystem/sail-operator/blob/main/common/scripts/kind_provisioner.sh) and [`integ-suite-kind.sh`](https://github.com/istio-ecosystem/sail-operator/blob/main/tests/e2e/integ-suite-kind.sh), which are copied from the `github.com/istio/common-files` repository to set up the kind cluster used for the test. -* In the case of OCP execution, it relies on the `inter-suite-ocp.sh` and `common-operator-integ-suite` scripts to setup the OCP cluster to be ready for the test. +* In the case of OCP execution, it relies on the `integ-suite-ocp.sh` and `common-operator-integ-suite.sh` scripts to setup the OCP cluster to be ready for the test. ## Table of Contents @@ -198,7 +198,7 @@ $ make BUILD_WITH_CONTAINER=0 test.e2e.kind ``` or ``` -$ make BUILD_WITH_CONTAINER=0 test.2e2.ocp +$ make BUILD_WITH_CONTAINER=0 test.e2e.ocp ``` ### Settings for end-to-end test execution From cc1d0b439ee33f3901e1911b4722991260c08927 Mon Sep 17 00:00:00 2001 From: Istio Automation Date: Mon, 24 Jun 2024 19:39:19 -0400 Subject: [PATCH 3/3] Automator: Update dependencies in istio-ecosystem/sail-operator@main (#177) Signed-off-by: istio-testing --- .../sailoperator.clusterserviceversion.yaml | 4 ++-- 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 | 6 +++--- resources/latest/charts/gateway/Chart.yaml | 4 ++-- resources/latest/charts/istiod/Chart.yaml | 4 ++-- .../istiod/templates/istiod-injector-configmap.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 | 12 ++++++------ 14 files changed, 29 insertions(+), 27 deletions(-) diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index 27826c55c..f41cc5bfc 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.1-latest - createdAt: "2024-06-21T23:35:20Z" + createdAt: "2024-06-24T23:28:18Z" description: Experimental operator for installing Istio service mesh features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -306,7 +306,7 @@ spec: - v1.21.3 - v1.21.2 - v1.21.0 - - latest (5579419b) + - latest (603e9024) [See this page](https://github.com/istio-ecosystem/sail-operator/blob/pre-main/bundle/README.md) for instructions on how to use it. displayName: Sail Operator diff --git a/chart/values.yaml b/chart/values.yaml index d2128c5bc..81c379cbd 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -21,7 +21,7 @@ csv: - v1.21.3 - v1.21.2 - v1.21.0 - - latest (5579419b) + - latest (603e9024) [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/go.mod b/go.mod index 27409d647..f333274e1 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.15.1 istio.io/client-go v1.22.0-alpha.1.0.20240620154436-0945d7438eb2 - istio.io/istio v0.0.0-20240621224720-5579419b80d6 + istio.io/istio v0.0.0-20240624224518-603e90243120 k8s.io/api v0.30.1 k8s.io/apiextensions-apiserver v0.30.1 k8s.io/apimachinery v0.30.1 diff --git a/go.sum b/go.sum index f60fdad1f..f044fd48a 100644 --- a/go.sum +++ b/go.sum @@ -495,8 +495,8 @@ istio.io/api v1.22.0-alpha.1.0.20240620154034-5b788fec62d2 h1:In1BXbQHMWmNn+wypv istio.io/api v1.22.0-alpha.1.0.20240620154034-5b788fec62d2/go.mod h1:THZA8sI/o2TXhmTM3P2EejCuE8VtWdMdrDQMD9FbdoU= istio.io/client-go v1.22.0-alpha.1.0.20240620154436-0945d7438eb2 h1:FrKxKJfaInf0odeq9INw4D4OmNmVlBPL5gaiE1J5Z/o= istio.io/client-go v1.22.0-alpha.1.0.20240620154436-0945d7438eb2/go.mod h1:OmCqmAHbNf4jkixGgDizSnTI5gpaJCVyKF7eWWuZq/A= -istio.io/istio v0.0.0-20240621224720-5579419b80d6 h1:U2QO36XtYzn9BIhkoAVpIYvQBuX6q1uPwxsSn26Yklg= -istio.io/istio v0.0.0-20240621224720-5579419b80d6/go.mod h1:qYijhwA483dgLirfCSXcZxcyegxCVRa3TTwJ6Az8piM= +istio.io/istio v0.0.0-20240624224518-603e90243120 h1:TpY1nJeAlEW22PnqtRK6AcnQvBcY2z2EyEgIUSKRyAs= +istio.io/istio v0.0.0-20240624224518-603e90243120/go.mod h1:iTBH6dELuLuLhn+GBM3eWP98RiMTftnHO6Eg0/W+rkM= k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY= k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM= k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws= diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index 44e00ebcd..eed9bf510 100644 --- a/resources/latest/charts/base/Chart.yaml +++ b/resources/latest/charts/base/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326 +appVersion: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 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.5579419b80d666203426b1f4ed41f71c364d0326 +version: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index 24a6f00fd..369281fef 100644 --- a/resources/latest/charts/cni/Chart.yaml +++ b/resources/latest/charts/cni/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326 +appVersion: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 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.5579419b80d666203426b1f4ed41f71c364d0326 +version: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index efac86293..839366758 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -51,8 +51,8 @@ defaults: configDir: "" # If enabled, and ambient is enabled, DNS redirection will be enabled dnsCapture: false - # UNSTABLE: If enabled, and ambient is enabled, enables ipv6 support - ipv6: false + # If enabled, and ambient is enabled, enables ipv6 support + ipv6: true repair: @@ -112,7 +112,7 @@ defaults: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326 + tag: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 # 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 3e689bae0..8b2af8238 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.5579419b80d666203426b1f4ed41f71c364d0326 +appVersion: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 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.5579419b80d666203426b1f4ed41f71c364d0326 +version: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index c98a1b7d2..38dde2e95 100644 --- a/resources/latest/charts/istiod/Chart.yaml +++ b/resources/latest/charts/istiod/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326 +appVersion: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 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.5579419b80d666203426b1f4ed41f71c364d0326 +version: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 diff --git a/resources/latest/charts/istiod/templates/istiod-injector-configmap.yaml b/resources/latest/charts/istiod/templates/istiod-injector-configmap.yaml index 30e471497..24416c488 100644 --- a/resources/latest/charts/istiod/templates/istiod-injector-configmap.yaml +++ b/resources/latest/charts/istiod/templates/istiod-injector-configmap.yaml @@ -15,6 +15,8 @@ data: {{ $vals := pick .Values "global" "istio_cni" "sidecarInjectorWebhook" "revision" -}} {{ $pilotVals := pick .Values.pilot "cni" -}} {{ $vals = set $vals "pilot" $pilotVals -}} +{{ $gatewayVals := pick .Values.gateways "securityContext" -}} +{{ $vals = set $vals "gateways" $gatewayVals -}} {{ $vals | toPrettyJson | indent 4 }} # To disable injection: use omitSidecarInjectorConfigMap, which disables the webhook patching diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index ec68c36de..5e0c3b3f9 100644 --- a/resources/latest/charts/istiod/values.yaml +++ b/resources/latest/charts/istiod/values.yaml @@ -242,7 +242,7 @@ defaults: # Dev builds from prow are on gcr.io hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326 + tag: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 # 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 d3a9f662b..d77c90566 100644 --- a/resources/latest/charts/ztunnel/Chart.yaml +++ b/resources/latest/charts/ztunnel/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326 +appVersion: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 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.5579419b80d666203426b1f4ed41f71c364d0326 +version: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index bc0c44d83..454640604 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.5579419b80d666203426b1f4ed41f71c364d0326 + tag: 1.23-alpha.603e9024312081703587fe9b118814f6a2b97524 # 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 cd6e4b0ce..24beb5ba5 100644 --- a/versions.yaml +++ b/versions.yaml @@ -64,10 +64,10 @@ versions: version: 1.23-alpha repo: https://github.com/istio/istio branch: master - commit: 5579419b80d666203426b1f4ed41f71c364d0326 + commit: 603e9024312081703587fe9b118814f6a2b97524 charts: - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326/helm/base-1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326/helm/cni-1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326/helm/gateway-1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326/helm/istiod-1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326/helm/ztunnel-1.23-alpha.5579419b80d666203426b1f4ed41f71c364d0326.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.603e9024312081703587fe9b118814f6a2b97524/helm/base-1.23-alpha.603e9024312081703587fe9b118814f6a2b97524.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.603e9024312081703587fe9b118814f6a2b97524/helm/cni-1.23-alpha.603e9024312081703587fe9b118814f6a2b97524.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.603e9024312081703587fe9b118814f6a2b97524/helm/gateway-1.23-alpha.603e9024312081703587fe9b118814f6a2b97524.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.603e9024312081703587fe9b118814f6a2b97524/helm/istiod-1.23-alpha.603e9024312081703587fe9b118814f6a2b97524.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.603e9024312081703587fe9b118814f6a2b97524/helm/ztunnel-1.23-alpha.603e9024312081703587fe9b118814f6a2b97524.tgz