diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c7d55891b..15251b657 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-621a64a11b30f703b2e887df91862fffdd16112e", + "image": "gcr.io/istio-testing/build-tools:master-4759bf88d40172234fc6a0b9e11a4c5f1ea58a90", "privileged": true, "remoteEnv": { "USE_GKE_GCLOUD_AUTH_PLUGIN": "True", diff --git a/.github/workflows/update-deps.yaml b/.github/workflows/update-deps.yaml index 8e7bf307a..335c3f7a9 100644 --- a/.github/workflows/update-deps.yaml +++ b/.github/workflows/update-deps.yaml @@ -23,7 +23,7 @@ jobs: update-deps: runs-on: ubuntu-latest container: - image: gcr.io/istio-testing/build-tools:master-621a64a11b30f703b2e887df91862fffdd16112e + image: gcr.io/istio-testing/build-tools:master-4759bf88d40172234fc6a0b9e11a4c5f1ea58a90 options: --entrypoint '' steps: diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index cd0ba32b0..2f1993661 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-15T06:09:50Z" + createdAt: "2024-10-16T05:05:08Z" description: Experimental operator for installing Istio service mesh features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -375,7 +375,7 @@ spec: - v1.23.2 - v1.22.5 - v1.21.6 - - latest (358edc01) + - latest (1d92787e) [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 @@ -599,10 +599,10 @@ spec: template: metadata: annotations: - 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.latest.cni: gcr.io/istio-testing/install-cni:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 + images.latest.istiod: gcr.io/istio-testing/pilot:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 + images.latest.proxy: gcr.io/istio-testing/proxyv2:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 + images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 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 @@ -768,13 +768,13 @@ spec: provider: name: Red Hat, Inc. relatedImages: - - image: gcr.io/istio-testing/install-cni:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 + - image: gcr.io/istio-testing/install-cni:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 name: latest.cni - - image: gcr.io/istio-testing/pilot:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 + - image: gcr.io/istio-testing/pilot:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 name: latest.istiod - - image: gcr.io/istio-testing/proxyv2:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 + - image: gcr.io/istio-testing/proxyv2:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 name: latest.proxy - - image: gcr.io/istio-testing/ztunnel:1.24-alpha.358edc01a5abb53259ad1637a63d7562b040a6f1 + - image: gcr.io/istio-testing/ztunnel:1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 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 6b7cd39ec..d7b7333c8 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -21,7 +21,7 @@ csv: - v1.23.2 - v1.22.5 - v1.21.6 - - latest (358edc01) + - latest (1d92787e) [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/common/.commonfiles.sha b/common/.commonfiles.sha index 077219cb7..aebb24f3e 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -d09ba3d6a3a89b606bae1bbe4a1e6537b1b72d79 +82dc68a737b72d394c344d4fd71ff9e9ebf01852 diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh index 9dcc144a7..c63f1fa33 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-621a64a11b30f703b2e887df91862fffdd16112e + IMAGE_VERSION=master-4759bf88d40172234fc6a0b9e11a4c5f1ea58a90 fi if [[ "${IMAGE_NAME:-}" == "" ]]; then IMAGE_NAME=build-tools diff --git a/go.mod b/go.mod index 149e20cff..444a8c2e3 100644 --- a/go.mod +++ b/go.mod @@ -23,8 +23,8 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 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-20241015000627-358edc01a5ab + istio.io/client-go v1.23.0-alpha.0.0.20241016001849-29f61837a029 + istio.io/istio v0.0.0-20241016035750-1d92787e64d8 k8s.io/api v0.31.1 k8s.io/apiextensions-apiserver v0.31.1 k8s.io/apimachinery v0.31.1 @@ -166,7 +166,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.23.0-alpha.0.0.20241011000314-650491578381 // indirect + istio.io/api v1.23.0-alpha.0.0.20241016001450-1e82bd43199b // indirect k8s.io/apiserver v0.31.1 // indirect k8s.io/component-base v0.31.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect diff --git a/go.sum b/go.sum index b1d744f0b..02ff9a929 100644 --- a/go.sum +++ b/go.sum @@ -489,12 +489,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.1 h1:cER6tI/8PgUAsaJaQCVBUg3VI9KN4oVaZJgY60RIc0c= helm.sh/helm/v3 v3.16.1/go.mod h1:r+xBHHP20qJeEqtvBXMf7W35QDJnzY/eiEBzt+TfHps= -istio.io/api v1.23.0-alpha.0.0.20241011000314-650491578381 h1:ZgYTwI0GqRLuany0gLzohY9UW8cVS7cX7gRfGziGnP0= -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-20241015000627-358edc01a5ab h1:ASlKPnedbweaDwTCV2MkU35LECx+jJAALl36uRo04Vk= -istio.io/istio v0.0.0-20241015000627-358edc01a5ab/go.mod h1:OjXgkrdrI5myoxr0eDxoWm+q5kFrcgLNlJLRvGd5ZIk= +istio.io/api v1.23.0-alpha.0.0.20241016001450-1e82bd43199b h1:M4Jl9GaT7FW0m4L8GRSip6M5hdUBZYXHyMFMGof0AIs= +istio.io/api v1.23.0-alpha.0.0.20241016001450-1e82bd43199b/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I= +istio.io/client-go v1.23.0-alpha.0.0.20241016001849-29f61837a029 h1:b8K9SSN06AfSMBKy37sS+/VFaUQCnDnHCOJBOXHwYKo= +istio.io/client-go v1.23.0-alpha.0.0.20241016001849-29f61837a029/go.mod h1:EiGjBEP+sbj1M/xdkXX60aVsLmJunLQqMpl2YjmHgS4= +istio.io/istio v0.0.0-20241016035750-1d92787e64d8 h1:v4NkEKghPMy/N32RVARizxMHfJNpQVSHc5Nmu76v4E0= +istio.io/istio v0.0.0-20241016035750-1d92787e64d8/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 7dedcf2da..e4ee03623 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +version: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index facd79f88..cf68d8903 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +version: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index 117be557b..e6427f9ca 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.358edc01a5abb53259ad1637a63d7562b040a6f1 + tag: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 # 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 464a101ba..94d2fec5c 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +version: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index 3609ffcc6..940b56296 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +version: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 diff --git a/resources/latest/charts/istiod/files/injection-template.yaml b/resources/latest/charts/istiod/files/injection-template.yaml index a0b8d5b6f..0ef948e6a 100644 --- a/resources/latest/charts/istiod/files/injection-template.yaml +++ b/resources/latest/charts/istiod/files/injection-template.yaml @@ -24,7 +24,7 @@ {{- end }} {{- end }} {{- end }} -{{ $nativeSidecar := (eq (env "ENABLE_NATIVE_SIDECARS" "false") "true") }} +{{ $nativeSidecar := (or (and (not (isset .ObjectMeta.Annotations `sidecar.istio.io/nativeSidecar`)) (eq (env "ENABLE_NATIVE_SIDECARS" "false") "true")) (eq (index .ObjectMeta.Annotations `sidecar.istio.io/nativeSidecar`) "true")) }} {{- $containers := list }} {{- range $index, $container := .Spec.Containers }}{{ if not (eq $container.Name "istio-proxy") }}{{ $containers = append $containers $container.Name }}{{end}}{{- end}} metadata: diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index 8f575aba1..e17cba325 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.358edc01a5abb53259ad1637a63d7562b040a6f1 + tag: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 # 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 16693702b..3665c644a 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +appVersion: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 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.358edc01a5abb53259ad1637a63d7562b040a6f1 +version: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index 660ac629a..3b09eb5cd 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.358edc01a5abb53259ad1637a63d7562b040a6f1 + tag: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 # 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 9f0e9e41f..d4170669d 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.358edc01a5abb53259ad1637a63d7562b040a6f1 + version: 1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070 repo: https://github.com/istio/istio branch: master - commit: 358edc01a5abb53259ad1637a63d7562b040a6f1 + commit: 1d92787e64d8c46594e86ae9b5e90265384e5070 charts: - - 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 + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/base-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/cni-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/gateway-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/istiod-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz + - https://storage.googleapis.com/istio-build/dev/1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070/helm/ztunnel-1.24-alpha.1d92787e64d8c46594e86ae9b5e90265384e5070.tgz