diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index 6d6bec5c0..1e57beb61 100644 --- a/bundle/manifests/sailoperator.clusterserviceversion.yaml +++ b/bundle/manifests/sailoperator.clusterserviceversion.yaml @@ -23,7 +23,7 @@ metadata: capabilities: Seamless Upgrades categories: OpenShift Optional, Integration & Delivery, Networking, Security containerImage: quay.io/maistra-dev/istio-operator:3.0-latest - createdAt: "2024-02-29T14:33:05Z" + createdAt: "2024-03-05T03:42:38Z" description: Experimental operator for installing Istio service mesh features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -222,7 +222,7 @@ spec: - v1.20.3 - v1.19.7 - - latest (bcd8cdca) + - latest (bd5f4f05) [See this page](https://github.com/maistra/istio-operator/blob/maistra-3.0/bundle/README.md) for instructions on how to use it. displayName: Sail Operator diff --git a/chart/values.yaml b/chart/values.yaml index 9d041f3c7..c6bc6316f 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -18,7 +18,7 @@ csv: - v1.20.3 - v1.19.7 - - latest (bcd8cdca) + - latest (bd5f4f05) [See this page](https://github.com/maistra/istio-operator/blob/maistra-3.0/bundle/README.md) for instructions on how to use it. support: Community based diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index 5b2dffabb..18e0161a6 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -9f064a680dc69e212c42e23af3e7d025fe21d9ef +689b33f2ec2fe303ad3f11ec18b65311070acaa6 diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk index 617da2607..89de83345 100644 --- a/common/Makefile.common.mk +++ b/common/Makefile.common.mk @@ -101,10 +101,16 @@ update-common: @git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/$(BUILD_TOOLS_ORG)/common-files $(TMP)/common-files @cd $(TMP)/common-files ; git rev-parse HEAD >files/common/.commonfiles.sha @rm -fr common +# istio/community has its own CONTRIBUTING.md file. @CONTRIB_OVERRIDE=$(shell grep -l "istio/community/blob/master/CONTRIBUTING.md" CONTRIBUTING.md) @if [ "$(CONTRIB_OVERRIDE)" != "CONTRIBUTING.md" ]; then\ rm $(TMP)/common-files/files/CONTRIBUTING.md;\ fi +# istio/istio.io uses the Creative Commons Attribution 4.0 license. Don't update LICENSE with the common Apache license. + @LICENSE_OVERRIDE=$(shell grep -l "Creative Commons Attribution 4.0 International Public License" LICENSE) + @if [ "$(LICENSE_OVERRIDE)" != "LICENSE" ]; then\ + rm $(TMP)/common-files/files/LICENSE;\ + fi @cp -a $(TMP)/common-files/files/* $(TMP)/common-files/files/.devcontainer $(TMP)/common-files/files/.gitattributes $(shell pwd) @rm -fr $(TMP)/common-files @$(or $(COMMONFILES_POSTPROCESS), true) diff --git a/resources/latest/charts/base/Chart.yaml b/resources/latest/charts/base/Chart.yaml index f8a3f99bf..0a1e49d93 100644 --- a/resources/latest/charts/base/Chart.yaml +++ b/resources/latest/charts/base/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +appVersion: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d 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.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +version: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d diff --git a/resources/latest/charts/cni/Chart.yaml b/resources/latest/charts/cni/Chart.yaml index cacdeff5e..fb608fce3 100644 --- a/resources/latest/charts/cni/Chart.yaml +++ b/resources/latest/charts/cni/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +appVersion: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d 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/tree/master/cni -version: 1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +version: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d diff --git a/resources/latest/charts/cni/values.yaml b/resources/latest/charts/cni/values.yaml index c9d48aa57..daae5e58c 100644 --- a/resources/latest/charts/cni/values.yaml +++ b/resources/latest/charts/cni/values.yaml @@ -111,7 +111,7 @@ defaults: hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 + tag: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d # 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 11caa0eb4..55d0ecbac 100644 --- a/resources/latest/charts/gateway/Chart.yaml +++ b/resources/latest/charts/gateway/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +appVersion: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d 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.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +version: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d diff --git a/resources/latest/charts/istiod/Chart.yaml b/resources/latest/charts/istiod/Chart.yaml index 600b94ba8..01759024c 100644 --- a/resources/latest/charts/istiod/Chart.yaml +++ b/resources/latest/charts/istiod/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +appVersion: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d 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.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +version: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d diff --git a/resources/latest/charts/istiod/templates/deployment.yaml b/resources/latest/charts/istiod/templates/deployment.yaml index b517029ef..90ae43558 100644 --- a/resources/latest/charts/istiod/templates/deployment.yaml +++ b/resources/latest/charts/istiod/templates/deployment.yaml @@ -99,10 +99,6 @@ spec: {{- end }} - --domain - {{ .Values.global.proxy.clusterDomain }} -{{- if .Values.global.oneNamespace }} - - "-a" - - {{ .Release.Namespace }} -{{- end }} - --keepaliveMaxServerConnectionAge - "{{ .Values.pilot.keepaliveMaxServerConnectionAge }}" {{- if .Values.pilot.extraContainerArgs }} diff --git a/resources/latest/charts/istiod/values.yaml b/resources/latest/charts/istiod/values.yaml index ea941d127..dca09d23b 100644 --- a/resources/latest/charts/istiod/values.yaml +++ b/resources/latest/charts/istiod/values.yaml @@ -219,7 +219,7 @@ defaults: # Dev builds from prow are on gcr.io hub: gcr.io/istio-testing # Default tag for Istio images. - tag: 1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 + tag: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d # Variant of the image to use. # Currently supported are: [debug, distroless] variant: "" @@ -251,10 +251,6 @@ defaults: omitSidecarInjectorConfigMap: false - # Whether to restrict the applications namespace the controller manages; - # If not set, controller watches all namespaces - oneNamespace: false - # Configure whether Operator manages webhook configurations. The current behavior # of Istiod is to manage its own webhook configurations. # When this option is set as true, Istio Operator, instead of webhooks, manages the diff --git a/resources/latest/charts/ztunnel/Chart.yaml b/resources/latest/charts/ztunnel/Chart.yaml index e967c6d8d..f83527878 100644 --- a/resources/latest/charts/ztunnel/Chart.yaml +++ b/resources/latest/charts/ztunnel/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +appVersion: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d 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.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 +version: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d diff --git a/resources/latest/charts/ztunnel/values.yaml b/resources/latest/charts/ztunnel/values.yaml index b72e49177..5ab901de9 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.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904 + tag: 1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d # 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 127d2f67d..b939b1a7e 100644 --- a/versions.yaml +++ b/versions.yaml @@ -30,10 +30,10 @@ versions: - name: latest repo: https://github.com/istio/istio branch: master - commit: bcd8cdcaab75609a28192908b7505baedc26a904 + commit: bd5f4f05b95fdc5fe371bdf4760948aa4c07399d charts: - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904/helm/base-1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904.tgz - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904/helm/cni-1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904.tgz - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904/helm/gateway-1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904.tgz - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904/helm/istiod-1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904.tgz - - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904/helm/ztunnel-1.22-alpha.bcd8cdcaab75609a28192908b7505baedc26a904.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d/helm/base-1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d/helm/cni-1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d/helm/gateway-1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d/helm/istiod-1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d.tgz + - https://storage.googleapis.com/istio-build/dev/1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d/helm/ztunnel-1.22-alpha.bd5f4f05b95fdc5fe371bdf4760948aa4c07399d.tgz