Skip to content

Commit 6838e5e

Browse files
authored
fix: Make cert-manager optional for secured metrics endpoints (#3706)
**Problem:** PR #3660 introduced cert-manager as a hard dependency for OLM deployments, causing installation failures when cert-manager CRDs are not present: error getting resource "olm/olm-cert" with GVK "cert-manager.io/v1, Kind=Certificate": no matches for kind "Certificate" in version "cert-manager.io/v1" This is a breaking change for existing users who don't have cert-manager installed. **Solution:** Make secured metrics endpoints an opt-in feature by setting `certManager.enabled: false` by default in Helm values. Users who want authenticated metrics must explicitly enable cert-manager. **Changes:** - Set `certManager.enabled: false` in `deploy/chart/values.yaml` - Remove `cert-manager-install` dependency from `make run-local` - Remove `--set certManager.enabled=true` override from `make deploy` - Remove automatic cert-manager cleanup from `make undeploy` **Behavior:** - Default (cert-manager disabled): HTTP metrics on port 8080, no authentication - Opt-in (`certManager.enabled: true`): HTTPS metrics on port 8443 with authentication/authorization Fixes the breaking change introduced in #3660 while preserving the secured metrics feature for users who want it.
1 parent 9310fcd commit 6838e5e

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ local-build: IMAGE_TAG = local
163163
local-build: image
164164

165165
.PHONY: run-local
166-
run-local: local-build kind-create cert-manager-install deploy
166+
run-local: local-build kind-create deploy
167167

168168
.PHONY: cert-manager-install
169169
cert-manager-install: #HELP Install cert-manager $(CERT_MANAGER_VERSION)
@@ -259,7 +259,6 @@ deploy: $(KIND) $(HELM) #HELP Deploy OLM to kind cluster $KIND_CLUSTER_NAME (def
259259
$(KIND) load docker-image $(OLM_IMAGE) --name $(KIND_CLUSTER_NAME); \
260260
$(HELM) upgrade --install olm deploy/chart \
261261
--set debug=true \
262-
--set certManager.enabled=true \
263262
--set olm.image.ref=$(OLM_IMAGE) \
264263
--set olm.image.pullPolicy=IfNotPresent \
265264
--set catalog.image.ref=$(OLM_IMAGE) \
@@ -283,9 +282,6 @@ undeploy: $(KIND) $(HELM) #HELP Uninstall OLM from kind cluster $KIND_CLUSTER_NA
283282
$(HELM) uninstall olm
284283
kubectl delete -f deploy/chart/crds
285284

286-
# Uninstall cert-manager
287-
$(MAKE) cert-manager-uninstall
288-
289285
#SECTION e2e
290286

291287
# E2E test configuration

deploy/chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ monitoring:
7979
namespace: monitoring
8080

8181
certManager:
82-
enabled: true
82+
enabled: false
8383
issuer:
8484
name: olm-ca-issuer
8585
selfSigned: true

0 commit comments

Comments
 (0)