merge upstream main

Resolve conflicts with upstream changes:
- PR #2515: ApplyConfiguration types (applier refactoring)
- PR #2528: Bundle deployment configuration docs

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: joelanford

.bingo/Variables.mk

@@ -29,11 +29,11 @@ $(CONFTEST): $(BINGO_DIR)/conftest.mod
 	@echo "(re)installing $(GOBIN)/conftest-v0.62.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=conftest.mod -o=$(GOBIN)/conftest-v0.62.0 "github.com/open-policy-agent/conftest"
 
-CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.20.0
+CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.20.1
 $(CONTROLLER_GEN): $(BINGO_DIR)/controller-gen.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/controller-gen-v0.20.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.20.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
+	@echo "(re)installing $(GOBIN)/controller-gen-v0.20.1"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.20.1 "sigs.k8s.io/controller-tools/cmd/controller-gen"
 
 CRD_DIFF := $(GOBIN)/crd-diff-v0.5.0
 $(CRD_DIFF): $(BINGO_DIR)/crd-diff.mod

.bingo/controller-gen.mod

@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.25.0
 
-require sigs.k8s.io/controller-tools v0.20.0 // cmd/controller-gen
+require sigs.k8s.io/controller-tools v0.20.1 // cmd/controller-gen

.bingo/controller-gen.sum

@@ -175,6 +175,8 @@ sigs.k8s.io/controller-tools v0.19.0 h1:OU7jrPPiZusryu6YK0jYSjPqg8Vhf8cAzluP9XGI
 sigs.k8s.io/controller-tools v0.19.0/go.mod h1:y5HY/iNDFkmFla2CfQoVb2AQXMsBk4ad84iR1PLANB0=
 sigs.k8s.io/controller-tools v0.20.0 h1:VWZF71pwSQ2lZZCt7hFGJsOfDc5dVG28/IysjjMWXL8=
 sigs.k8s.io/controller-tools v0.20.0/go.mod h1:b4qPmjGU3iZwqn34alUU5tILhNa9+VXK+J3QV0fT/uU=
+sigs.k8s.io/controller-tools v0.20.1 h1:gkfMt9YodI0K85oT8rVi80NTXO/kDmabKR5Ajn5GYxs=
+sigs.k8s.io/controller-tools v0.20.1/go.mod h1:b4qPmjGU3iZwqn34alUU5tILhNa9+VXK+J3QV0fT/uU=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

.bingo/variables.env

@@ -12,7 +12,7 @@ BINGO="${GOBIN}/bingo-v0.9.0"
 
 CONFTEST="${GOBIN}/conftest-v0.62.0"
 
-CONTROLLER_GEN="${GOBIN}/controller-gen-v0.20.0"
+CONTROLLER_GEN="${GOBIN}/controller-gen-v0.20.1"
 
 CRD_DIFF="${GOBIN}/crd-diff-v0.5.0"
 

Makefile

@@ -193,8 +193,10 @@ manifests: update-crds $(MANIFESTS) $(HELM) #EXHELP Generate OLMv1 manifests
 	$(HELM) template olmv1 helm/olmv1 --set "options.openshift.enabled=true" > /dev/null
 
 .PHONY: generate
-generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	@find api cmd hack internal -name "zz_generated.deepcopy.go" -not -path "*/vendor/*" -delete # Need to delete the files for them to be generated properly
+generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, DeepCopyObject, and ApplyConfiguration type implementations.
+	# Need to delete the files for them to be generated properly
+	@find api cmd hack internal -name "zz_generated.deepcopy.go" -not -path "*/vendor/*" -delete && rm -rf applyconfigurations
+	$(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) applyconfiguration:headerFile="hack/boilerplate.go.txt" paths="./api/..."
 	$(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 .PHONY: verify
@@ -317,7 +319,11 @@ test-experimental-e2e: run-internal image-registry prometheus e2e e2e-coverage k
 prometheus: PROMETHEUS_NAMESPACE := olmv1-system
 prometheus: PROMETHEUS_VERSION := v0.83.0
 prometheus: $(KUSTOMIZE) #EXHELP Deploy Prometheus into specified namespace
+ifeq ($(strip $(E2E_SUMMARY_OUTPUT)),)
+	@echo "E2E_SUMMARY_OUTPUT unset; skipping prometheus deployment"
+else
 	./hack/test/install-prometheus.sh $(PROMETHEUS_NAMESPACE) $(PROMETHEUS_VERSION) $(VERSION) $(PROMETHEUS_VALUES)
+endif
 
 .PHONY: test-extension-developer-e2e
 test-extension-developer-e2e: SOURCE_MANIFEST := $(STANDARD_E2E_MANIFEST)

api/v1/clustercatalog_types.go

@@ -44,6 +44,8 @@ const (
 	ReasonUserSpecifiedUnavailable = "UserSpecifiedUnavailable"
 )
 
+// +genclient
+// +genclient:nonNamespaced
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:scope=Cluster
 //+kubebuilder:subresource:status

api/v1/clusterextension_types.go

@@ -540,6 +540,8 @@ type ClusterExtensionInstallStatus struct {
 	Bundle BundleMetadata `json:"bundle"`
 }
 
+// +genclient
+// +genclient:nonNamespaced
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:subresource:status

api/v1/clusterextensionrevision_types.go

@@ -252,6 +252,8 @@ type ClusterExtensionRevisionStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
+// +genclient
+// +genclient:nonNamespaced
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:subresource:status

api/v1/groupversion_info.go

@@ -17,6 +17,8 @@ limitations under the License.
 // Package v1 contains API Schema definitions for the olm v1 API group
 // +kubebuilder:object:generate=true
 // +groupName=olm.operatorframework.io
+// +kubebuilder:ac:generate=true
+// +kubebuilder:ac:output:package=../../applyconfigurations
 package v1
 
 import (
@@ -28,6 +30,10 @@ var (
 	// GroupVersion is group version used to register these objects
 	GroupVersion = schema.GroupVersion{Group: "olm.operatorframework.io", Version: "v1"}
 
+	// SchemeGroupVersion is an alias for GroupVersion, required by the
+	// generated apply configuration code.
+	SchemeGroupVersion = GroupVersion
+
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}