diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0e37d3964..90f5c9e33 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-89ff97db972e1ec7d61a7831bf9408f509e17d73", + "image": "gcr.io/istio-testing/build-tools:master-b9a4a433d98c4160b77c77a93be94f2aa07c5c4d", "privileged": true, "remoteEnv": { "USE_GKE_GCLOUD_AUTH_PLUGIN": "True", diff --git a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml index 19d9f1d3c..2e0abb38a 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-06-27T03:09:11Z" + createdAt: "2024-06-28T06:10:47Z" 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 53be77bcf..fd517a7ec 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -21,7 +21,7 @@ csv: - v1.21.3 - v1.21.2 - v1.21.0 - - latest (1c596330) + - latest (e3386b49) [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 a5edfabec..567df701d 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -270400095e818eaafb79b2041cff0f3af69cd1a9 +d668a644804baba70c5d6bd4b7015b30b933c6c2 diff --git a/common/scripts/check_clean_repo.sh b/common/scripts/check_clean_repo.sh index abe067398..ff4000024 100755 --- a/common/scripts/check_clean_repo.sh +++ b/common/scripts/check_clean_repo.sh @@ -24,6 +24,7 @@ function write_patch_file() { git diff > "${PATCH_OUT}" [ -n "${JOB_NAME}" ] && [ -n "${BUILD_ID}" ] + # shellcheck disable=SC2319 IN_PROW="$?" # Don't persist large diffs (30M+) on CI diff --git a/common/scripts/kind_provisioner.sh b/common/scripts/kind_provisioner.sh index d4bc2a222..9c372b9ca 100644 --- a/common/scripts/kind_provisioner.sh +++ b/common/scripts/kind_provisioner.sh @@ -174,13 +174,9 @@ function setup_kind_cluster() { CONFIG=${DEFAULT_CLUSTER_YAML} fi - # Configure the cluster IP Family if explicitly set - if [ "${IP_FAMILY}" != "ipv4" ]; then - grep "ipFamily: ${IP_FAMILY}" "${CONFIG}" || \ - cat <> "${CONFIG}" -networking: - ipFamily: ${IP_FAMILY} -EOF + # Configure the ipFamily of the cluster + if [ -n "${IP_FAMILY}" ]; then + yq eval ".networking.ipFamily = \"${IP_FAMILY}\"" -i "${CONFIG}" fi KIND_WAIT_FLAG="--wait=180s" diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh index bbc22c99b..b5839c08c 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-89ff97db972e1ec7d61a7831bf9408f509e17d73 + IMAGE_VERSION=master-b9a4a433d98c4160b77c77a93be94f2aa07c5c4d fi if [[ "${IMAGE_NAME:-}" == "" ]]; then IMAGE_NAME=build-tools diff --git a/go.mod b/go.mod index b9657797b..1d33f85bf 100644 --- a/go.mod +++ b/go.mod @@ -18,8 +18,8 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 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-20240626221714-1c5963301ae4 + istio.io/client-go v1.22.0-alpha.1.0.20240627152116-db4c4391f1c9 + istio.io/istio v0.0.0-20240627205617-e3386b498afe k8s.io/api v0.30.1 k8s.io/apiextensions-apiserver v0.30.1 k8s.io/apimachinery v0.30.1 @@ -130,7 +130,7 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xlab/treeprint v1.2.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect @@ -152,7 +152,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.22.0-alpha.1.0.20240620154034-5b788fec62d2 // indirect + istio.io/api v1.22.0-alpha.1.0.20240627151415-7c6732ba7766 // indirect k8s.io/apiserver v0.30.1 // indirect k8s.io/component-base v0.30.1 // indirect k8s.io/klog/v2 v2.120.1 // indirect diff --git a/go.sum b/go.sum index 78da56dc2..bfb9ea450 100644 --- a/go.sum +++ b/go.sum @@ -366,8 +366,8 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 h1:cEPbyTSEHlQR89XVlyo78gqluF8Y3oMeBkXGWzQsfXY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0/go.mod h1:DKdbWcT4GH1D0Y3Sqt/PFXt2naRKDWtU+eE6oLdFNA8= go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= @@ -491,12 +491,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.15.1 h1:22ztacHz4gMqhXNqCQ9NAg6BFWoRUryNLvnkz6OVyw0= helm.sh/helm/v3 v3.15.1/go.mod h1:fvfoRcB8UKRUV5jrIfOTaN/pG1TPhuqSb56fjYdTKXg= -istio.io/api v1.22.0-alpha.1.0.20240620154034-5b788fec62d2 h1:In1BXbQHMWmNn+wypvw0ZqP8jgn5V+QO0ie9lqongro= -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-20240626221714-1c5963301ae4 h1:MToJF7J6GMgPpYbWBKI5Ex7WYLgryh8u+eAy62e0Ajo= -istio.io/istio v0.0.0-20240626221714-1c5963301ae4/go.mod h1:iTBH6dELuLuLhn+GBM3eWP98RiMTftnHO6Eg0/W+rkM= +istio.io/api v1.22.0-alpha.1.0.20240627151415-7c6732ba7766 h1:93hu50eblCukPXsGNWnVHy0Gmz5m4gOIODUCBm5alTs= +istio.io/api v1.22.0-alpha.1.0.20240627151415-7c6732ba7766/go.mod h1:THZA8sI/o2TXhmTM3P2EejCuE8VtWdMdrDQMD9FbdoU= +istio.io/client-go v1.22.0-alpha.1.0.20240627152116-db4c4391f1c9 h1:nXZHBAWwJ3m6ymD3+AbOCPHPhiFOAT+PVMHjkz/sd7Y= +istio.io/client-go v1.22.0-alpha.1.0.20240627152116-db4c4391f1c9/go.mod h1:vr3qK866iUNWHlvThNeZmrxYBS+2jwa6vJ56mgtBrwI= +istio.io/istio v0.0.0-20240627205617-e3386b498afe h1:Ed4wYvDjejCCHE7ohWEbGUGWBODJEMA3atjAbH5OV/A= +istio.io/istio v0.0.0-20240627205617-e3386b498afe/go.mod h1:d3kRp0sD45vg8pj0f2pysErOPW3OBSkhF4Ok7GO5Sdk= 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 9aa690e7a..e62587b09 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +appVersion: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +version: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index 9a52f89ee..87543e280 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +appVersion: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +version: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index 8587cdcd3..01dbb4f2d 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.1c5963301ae491bdb7a76d9480fcc0610c045559 + tag: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 # 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 c1ac23fd4..923142549 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +appVersion: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +version: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index 8d77515b2..d801f9d15 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +appVersion: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +version: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index 0320b5eda..434aaed2a 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.1c5963301ae491bdb7a76d9480fcc0610c045559 + tag: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 # 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 3faf2cfd9..0aef6553e 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +appVersion: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 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.1c5963301ae491bdb7a76d9480fcc0610c045559 +version: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index 034a9f071..e7f43b1b8 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.1c5963301ae491bdb7a76d9480fcc0610c045559 + tag: 1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8 # 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 4e670b9f2..0ce7903e6 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: 1c5963301ae491bdb7a76d9480fcc0610c045559 + commit: e3386b498afee33d7362c061135de6084881e2b8 charts: - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/base-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/cni-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/gateway-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/istiod-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz - - https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/ztunnel-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8/helm/base-1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8/helm/cni-1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8/helm/gateway-1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8/helm/istiod-1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8.tgz + - https://storage.googleapis.com/istio-build/dev/1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8/helm/ztunnel-1.23-alpha.e3386b498afee33d7362c061135de6084881e2b8.tgz