NO-ISSUE: Synchronize From Upstream Repositories

.bingo/Variables.mk

@@ -29,17 +29,17 @@ $(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.1
+CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.21.0
 $(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.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"
+	@echo "(re)installing $(GOBIN)/controller-gen-v0.21.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.21.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
 
-CRD_DIFF := $(GOBIN)/crd-diff-v0.5.1-0.20260309184313-54162f2e3097
+CRD_DIFF := $(GOBIN)/crd-diff-v0.6.0
 $(CRD_DIFF): $(BINGO_DIR)/crd-diff.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)/crd-diff-v0.5.1-0.20260309184313-54162f2e3097"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=crd-diff.mod -o=$(GOBIN)/crd-diff-v0.5.1-0.20260309184313-54162f2e3097 "sigs.k8s.io/crdify"
+	@echo "(re)installing $(GOBIN)/crd-diff-v0.6.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=crd-diff.mod -o=$(GOBIN)/crd-diff-v0.6.0 "sigs.k8s.io/crdify"
 
 CRD_REF_DOCS := $(GOBIN)/crd-ref-docs-v0.3.0
 $(CRD_REF_DOCS): $(BINGO_DIR)/crd-ref-docs.mod
@@ -77,12 +77,6 @@ $(KUBE_SCORE): $(BINGO_DIR)/kube-score.mod
 	@echo "(re)installing $(GOBIN)/kube-score-v1.20.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kube-score.mod -o=$(GOBIN)/kube-score-v1.20.0 "github.com/zegl/kube-score/cmd/kube-score"
 
-KUSTOMIZE := $(GOBIN)/kustomize-v5.7.1
-$(KUSTOMIZE): $(BINGO_DIR)/kustomize.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)/kustomize-v5.7.1"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v5.7.1 "sigs.k8s.io/kustomize/kustomize/v5"
-
 OPERATOR_SDK := $(GOBIN)/operator-sdk-v1.41.1
 $(OPERATOR_SDK): $(BINGO_DIR)/operator-sdk.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.

.bingo/controller-gen.mod

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

.bingo/crd-diff.mod

@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.24.6
 
-require sigs.k8s.io/crdify v0.5.1-0.20260309184313-54162f2e3097
+require sigs.k8s.io/crdify v0.6.0

.bingo/crd-diff.sum

@@ -253,6 +253,8 @@ sigs.k8s.io/crdify v0.5.0 h1:mrMH9CgXQPTZUpTU6Klqfnlys8bggv/7uvLT2lXSP7A=
 sigs.k8s.io/crdify v0.5.0/go.mod h1:ZIFxaYNgKYmFtZCLPysncXQ8oqwnNlHQbRUfxJHZwzU=
 sigs.k8s.io/crdify v0.5.1-0.20260309184313-54162f2e3097 h1:gwDRFCc64lhEpxY944IJFW+CrmMFXWH+JjpE0JHp42Y=
 sigs.k8s.io/crdify v0.5.1-0.20260309184313-54162f2e3097/go.mod h1:ZIFxaYNgKYmFtZCLPysncXQ8oqwnNlHQbRUfxJHZwzU=
+sigs.k8s.io/crdify v0.6.0 h1:1id5uhODipmEvmMC8jlr7IbpHTnepySWmBNEiwv23WQ=
+sigs.k8s.io/crdify v0.6.0/go.mod h1:ZIFxaYNgKYmFtZCLPysncXQ8oqwnNlHQbRUfxJHZwzU=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

.bingo/variables.env

@@ -12,9 +12,9 @@ BINGO="${GOBIN}/bingo-v0.9.0"
 
 CONFTEST="${GOBIN}/conftest-v0.62.0"
 
-CONTROLLER_GEN="${GOBIN}/controller-gen-v0.20.1"
+CONTROLLER_GEN="${GOBIN}/controller-gen-v0.21.0"
 
-CRD_DIFF="${GOBIN}/crd-diff-v0.5.1-0.20260309184313-54162f2e3097"
+CRD_DIFF="${GOBIN}/crd-diff-v0.6.0"
 
 CRD_REF_DOCS="${GOBIN}/crd-ref-docs-v0.3.0"
 
@@ -28,8 +28,6 @@ KIND="${GOBIN}/kind-v0.32.0"
 
 KUBE_SCORE="${GOBIN}/kube-score-v1.20.0"
 
-KUSTOMIZE="${GOBIN}/kustomize-v5.7.1"
-
 OPERATOR_SDK="${GOBIN}/operator-sdk-v1.41.1"
 
 OPM="${GOBIN}/opm-v1.60.0"

AGENTS.md

@@ -165,7 +165,8 @@ make generate
 │   │   ├── base/                    # Base manifests & CRDs
 │   │   ├── templates/               # Helm templates
 │   │   └── values.yaml              # Default values
-│   └── prometheus/                  # Prometheus monitoring
+├── testdata/
+│   └── prometheus/                  # kube-prometheus-stack values for e2e monitoring
 ├── test/                            # Test suites
 │   ├── e2e/                         # End-to-end tests (see test/e2e/README.md)
 │   ├── extension-developer-e2e/     # Extension developer tests

Makefile

@@ -55,7 +55,7 @@ ifeq ($(shell [[ $$HOME == "" || $$HOME == "/" ]] && [[ $$XDG_DATA_HOME == "" ]]
 	SETUP_ENVTEST_BIN_DIR_OVERRIDE += --bin-dir /tmp/envtest-binaries
 endif
 
-# bingo manages consistent tooling versions for things like kind, kustomize, etc.
+# bingo manages consistent tooling versions for things like kind, etc.
 include .bingo/Variables.mk
 
 ifeq ($(origin KIND_CLUSTER_NAME), undefined)
@@ -123,9 +123,8 @@ lint: lint-custom $(GOLANGCI_LINT) #HELP Run golangci linter.
 
 .PHONY: lint-helm
 lint-helm: $(HELM) $(CONFTEST) #HELP Run helm linter
-	helm lint helm/olmv1
-	helm lint helm/prometheus
-	(set -euo pipefail; helm template olmv1 helm/olmv1; helm template prometheus helm/prometheus) | $(CONFTEST) test --policy hack/conftest/policy/ --combine -n main -n prometheus -
+	$(HELM) lint helm/olmv1
+	(set -euo pipefail; $(HELM) template olmv1 helm/olmv1) | $(CONFTEST) test --policy hack/conftest/policy/ --combine -n main -
 
 .PHONY: lint-deployed-resources
 lint-deployed-resources: $(KUBE_SCORE) #EXHELP Lint deployed resources.
@@ -166,6 +165,10 @@ tidy:
 .PHONY: update-crds
 update-crds:
 	hack/tools/update-crds.sh
+	@# Revert CRD files where the only change is the controller-gen version annotation
+	@for f in $$(git diff --name-only -- helm/ hack/tools/crd-generator/testdata/); do \
+		git diff --quiet -I 'controller-gen.kubebuilder.io/version' -- "$$f" && git restore --worktree -- "$$f" || true; \
+	done
 
 # The filename variables can be overridden on the command line if you want to change the set of values files:
 # e.g. make "manifests/standard.yaml=helm/cert-manager.yaml my-values-file.yaml" manifests
@@ -188,6 +191,8 @@ $(MANIFESTS): $(HELM) $(CONFTEST)
 	@mkdir -p $(MANIFEST_HOME)
 	$(HELM) template olmv1 helm/olmv1 $(addprefix --values ,$($@)) $(addprefix --set ,$(HELM_SETTINGS)) > $@
 	$(CONFTEST) test --policy hack/conftest/policy/ -n main --combine $@
+	@# Revert manifest if the only change is the controller-gen version annotation
+	@git diff --quiet -I 'controller-gen.kubebuilder.io/version' -- "$@" && git restore --worktree -- "$@" || true
 
 # Generate manifests stored in source-control
 .PHONY: manifests
@@ -202,6 +207,10 @@ generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyI
 	@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="./..."
+	@# Revert generated files where the only change is the controller-gen version comment
+	@for f in $$(git diff --name-only); do \
+		git diff --quiet -I 'Code generated by controller-gen' -- "$$f" && git restore --worktree -- "$$f" || true; \
+	done
 
 .PHONY: verify
 verify: k8s-pin kind-verify-versions fmt generate manifests update-tls-profiles crd-ref-docs update-registryv1-bundle-schema verify-bingo #HELP Verify all generated code is up-to-date. Runs k8s-pin instead of just tidy.
@@ -328,18 +337,28 @@ test-experimental-e2e: GO_BUILD_EXTRA_FLAGS := -cover
 test-experimental-e2e: COVERAGE_NAME := experimental-e2e
 test-experimental-e2e: export MANIFEST := $(EXPERIMENTAL_RELEASE_MANIFEST)
 test-experimental-e2e: export INSTALL_DEFAULT_CATALOGS := false
-test-experimental-e2e: PROMETHEUS_VALUES := helm/prom_experimental.yaml
+test-experimental-e2e: PROMETHEUS_VALUES := testdata/prometheus/values-experimental.yaml
 test-experimental-e2e: E2E_TIMEOUT ?= 25m
 test-experimental-e2e: run-internal prometheus e2e e2e-coverage kind-clean #HELP Run experimental e2e test suite on local kind cluster
 
+CATALOGD_CERT_SECRET = catalogd-service-cert-$(VERSION)
+
 .PHONY: prometheus
 prometheus: PROMETHEUS_NAMESPACE := olmv1-system
-prometheus: PROMETHEUS_VERSION := v0.83.0
-prometheus: $(KUSTOMIZE) #EXHELP Deploy Prometheus into specified namespace
+prometheus: PROMETHEUS_CHART_VERSION := 86.2.2
+prometheus: $(HELM) #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)
+	$(HELM) upgrade --install prometheus oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack \
+	  --namespace $(PROMETHEUS_NAMESPACE) --create-namespace \
+	  --version $(PROMETHEUS_CHART_VERSION) \
+	  -f testdata/prometheus/values.yaml \
+	  $(if $(PROMETHEUS_VALUES),-f $(PROMETHEUS_VALUES)) \
+	  --set-string 'prometheus.additionalServiceMonitors[1].endpoints[0].tlsConfig.ca.secret.name=$(CATALOGD_CERT_SECRET)' \
+	  --set-string 'prometheus.additionalServiceMonitors[1].endpoints[0].tlsConfig.cert.secret.name=$(CATALOGD_CERT_SECRET)' \
+	  --set-string 'prometheus.additionalServiceMonitors[1].endpoints[0].tlsConfig.keySecret.name=$(CATALOGD_CERT_SECRET)' \
+	  --wait --timeout 5m
 endif
 
 .PHONY: test-extension-developer-e2e

api/v1/clustercatalog_types.go

@@ -18,6 +18,7 @@ package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // SourceType defines the type of source used for catalogs.
@@ -331,5 +332,8 @@ type ImageSource struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&ClusterCatalog{}, &ClusterCatalogList{})
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion, &ClusterCatalog{}, &ClusterCatalogList{})
+		return nil
+	})
 }

api/v1/clusterextension_types.go

@@ -19,6 +19,7 @@ package v1
 import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 var ClusterExtensionKind = "ClusterExtension"
@@ -606,5 +607,8 @@ type ClusterExtensionList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&ClusterExtension{}, &ClusterExtensionList{})
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion, &ClusterExtension{}, &ClusterExtensionList{})
+		return nil
+	})
 }

api/v1/clusterobjectset_types.go

@@ -19,6 +19,7 @@ package v1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 const (
@@ -593,5 +594,8 @@ type ClusterObjectSetList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&ClusterObjectSet{}, &ClusterObjectSetList{})
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion, &ClusterObjectSet{}, &ClusterObjectSetList{})
+		return nil
+	})
 }