Automated merge

* upstream/main: Don't log error when namespace is being deleted (openshift-service-mesh#88) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#89) Introduce a central way to get the project's root directory (openshift-service-mesh#83) Remove duplicates of oneMinuteAgo() (openshift-service-mesh#82) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#81) Deploy CNI DaemonSet immediately when namespace is created (openshift-service-mesh#80) Remove unused fields from BaseConfig (openshift-service-mesh#79) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#77) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#67) Refactor (openshift-service-mesh#76) Make bundle generation work during merges (openshift-service-mesh#73) Wrap errors to provide context (openshift-service-mesh#68) Ensure update-istio.sh updates version field in versions.yaml (openshift-service-mesh#72) Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (openshift-service-mesh#71) Ensure CI highlights failure in lint-watches.sh (openshift-service-mesh#70) Update SetDefaultEventuallyTimeout for e2e test (openshift-service-mesh#69) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#66) Ensure control plane is deployed immediately when the target namespace is created (openshift-service-mesh#65) Use INFO level to log missing namespace in IstioRevision/IstioCNI (openshift-service-mesh#64) # Conflicts: # bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-service-mesh-bot · Apr 29, 2024 · da758b4 · da758b4
2 parents f0dad80 + e6d483e
commit da758b4
Show file tree

Hide file tree

Showing 92 changed files with 2,253 additions and 283 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:master-f24be7b713480aab44d862ac839ead0b5324d593",
+  "image": "gcr.io/istio-testing/build-tools:master-8fb9ce88f6ad4cdd35c1660cd0ad0ab67eff4c6c",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -403,8 +403,8 @@ OPM ?= $(LOCALBIN)/opm
 ## Tool Versions
 OPERATOR_SDK_VERSION ?= v1.34.1
 HELM_VERSION ?= v3.14.4
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
-OPM_VERSION ?= v1.39.0
+CONTROLLER_TOOLS_VERSION ?= v0.15.0
+OPM_VERSION ?= v1.40.0
 GITLEAKS_VERSION ?= v8.18.2
 
 .PHONY: helm $(HELM)
@@ -461,7 +461,7 @@ bundle: gen helm operator-sdk ## Generate bundle manifests and metadata, then va
 		if (git ls-files --error-unmatch "$$csvPath" &>/dev/null); then \
 			if ! (git diff "$$csvPath" | grep '^[+-][^+-][^+-]' | grep -v "createdAt:" >/dev/null); then \
 				echo "reverting timestamp change in $$csvPath"; \
-				git checkout "$$csvPath"; \
+				git checkout "$$csvPath" || echo "failed to revert timestamp change. assuming we're in the middle of a merge"; \
 			fi \
 		fi
 	$(OPERATOR_SDK) bundle validate ./bundle

diff --git a/api/v1alpha1/istio_types.go b/api/v1alpha1/istio_types.go
@@ -51,10 +51,10 @@ type IstioSpec struct {
 	// +sail:profile
 	// The built-in installation configuration profile to use.
 	// The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-	// Must be one of: ambient, default, demo, empty, external, minimal, openshift-ambient, openshift, preview, remote.
+	// Must be one of: ambient, default, demo, empty, external, minimal, openshift-ambient, openshift, preview, remote, stable.
 	// +++PROFILES-DROPDOWN-HIDDEN-UNTIL-WE-FULLY-IMPLEMENT-THEM+++operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Profile",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:ambient", "urn:alm:descriptor:com.tectonic.ui:select:default", "urn:alm:descriptor:com.tectonic.ui:select:demo", "urn:alm:descriptor:com.tectonic.ui:select:empty", "urn:alm:descriptor:com.tectonic.ui:select:external", "urn:alm:descriptor:com.tectonic.ui:select:minimal", "urn:alm:descriptor:com.tectonic.ui:select:preview", "urn:alm:descriptor:com.tectonic.ui:select:remote"}
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
-	// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;minimal;openshift-ambient;openshift;preview;remote
+	// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;minimal;openshift-ambient;openshift;preview;remote;stable
 	Profile string `json:"profile,omitempty"`
 
 	// Namespace to which the Istio components should be installed.

diff --git a/api/v1alpha1/istiocni_types.go b/api/v1alpha1/istiocni_types.go
@@ -37,10 +37,10 @@ type IstioCNISpec struct {
 	// +sail:profile
 	// The built-in installation configuration profile to use.
 	// The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-	// Must be one of: ambient, default, demo, empty, external, minimal, openshift-ambient, openshift, preview, remote.
+	// Must be one of: ambient, default, demo, empty, external, minimal, openshift-ambient, openshift, preview, remote, stable.
 	// +++PROFILES-DROPDOWN-HIDDEN-UNTIL-WE-FULLY-IMPLEMENT-THEM+++operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Profile",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:ambient", "urn:alm:descriptor:com.tectonic.ui:select:default", "urn:alm:descriptor:com.tectonic.ui:select:demo", "urn:alm:descriptor:com.tectonic.ui:select:empty", "urn:alm:descriptor:com.tectonic.ui:select:external", "urn:alm:descriptor:com.tectonic.ui:select:minimal", "urn:alm:descriptor:com.tectonic.ui:select:preview", "urn:alm:descriptor:com.tectonic.ui:select:remote"}
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
-	// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;minimal;openshift-ambient;openshift;preview;remote
+	// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;minimal;openshift-ambient;openshift;preview;remote;stable
 	Profile string `json:"profile,omitempty"`
 
 	// Namespace to which the Istio CNI component should be installed.

diff --git a/api/v1alpha1/values_types.gen.go b/api/v1alpha1/values_types.gen.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/extensions.istio.io_wasmplugins.yaml b/bundle/manifests/extensions.istio.io_wasmplugins.yaml
@@ -120,6 +120,7 @@ spec:
                 type: string
               priority:
                 description: Determines ordering of `WasmPlugins` in the same `phase`.
+                format: int32
                 nullable: true
                 type: integer
               selector: