Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ test-e2e: run image-registry prometheus e2e e2e-metrics e2e-coverage kind-clean
test-experimental-e2e: SOURCE_MANIFEST := $(EXPERIMENTAL_E2E_MANIFEST)
test-experimental-e2e: KIND_CLUSTER_NAME := operator-controller-e2e
test-experimental-e2e: GO_BUILD_EXTRA_FLAGS := -cover
test-experimental-e2e: run image-registry prometheus experimental-e2e e2e-metrics e2e-coverage kind-clean #HELP Run experimental e2e test suite on local kind cluster
test-experimental-e2e: run image-registry prometheus experimental-e2e e2e e2e-metrics e2e-coverage kind-clean #HELP Run experimental e2e test suite on local kind cluster
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Make sense


.PHONY: prometheus
prometheus: PROMETHEUS_NAMESPACE := olmv1-system
Expand Down
6 changes: 5 additions & 1 deletion config/components/base/experimental/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ components:
# EXPERIMENTAL FEATURES ARE LISTED HERE
- ../../features/synthetic-user-permissions
- ../../features/webhook-provider-certmanager
- ../../features/webhook-provider-openshift-serviceca
- ../../features/single-own-namespace
- ../../features/preflight-permissions
- ../../features/apiv1-metas-handler
# This one is downstream only, so we shant use it
# - ../../features/webhook-provider-openshift-serviceca
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# kustomization file for catalogd APIv1 metas handler
# DO NOT ADD A NAMESPACE HERE
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
patches:
- target:
kind: Deployment
name: catalogd-controller-manager
path: patches/enable-featuregate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# enable APIv1 meta handler feature gate
- op: add
path: /spec/template/spec/containers/0/args/-
value: "--feature-gates=APIV1MetasHandler=true"
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# kustomization file for preflight permissions support
# DO NOT ADD A NAMESPACE HERE
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
patches:
- target:
kind: Deployment
name: operator-controller-controller-manager
path: patches/enable-featuregate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# enable preflight permissions feature gate
- op: add
path: /spec/template/spec/containers/0/args/-
value: "--feature-gates=PreflightPermissions=true"
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# kustomization file for single/own namespace install support
# DO NOT ADD A NAMESPACE HERE
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
patches:
- target:
kind: Deployment
name: operator-controller-controller-manager
path: patches/enable-featuregate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# enable single/own namespace install support feature gate
- op: add
path: /spec/template/spec/containers/0/args/-
value: "--feature-gates=SingleOwnNamespaceInstallSupport=true"
4 changes: 3 additions & 1 deletion manifests/experimental-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1596,6 +1596,7 @@ spec:
- --leader-elect
- --metrics-bind-address=:7443
- --external-address=catalogd-service.olmv1-system.svc
- --feature-gates=APIV1MetasHandler=true
- --tls-cert=/var/certs/tls.crt
- --tls-key=/var/certs/tls.key
- --pull-cas-dir=/var/ca-certs
Expand Down Expand Up @@ -1711,7 +1712,8 @@ spec:
- --leader-elect
- --feature-gates=SyntheticPermissions=true
- --feature-gates=WebhookProviderCertManager=true
- --feature-gates=WebhookProviderOpenshiftServiceCA=true
- --feature-gates=SingleOwnNamespaceInstallSupport=true
- --feature-gates=PreflightPermissions=true
- --catalogd-cas-dir=/var/certs
- --pull-cas-dir=/var/certs
- --tls-cert=/var/certs/tls.cert
Expand Down
4 changes: 3 additions & 1 deletion manifests/experimental.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1573,6 +1573,7 @@ spec:
- --leader-elect
- --metrics-bind-address=:7443
- --external-address=catalogd-service.olmv1-system.svc
- --feature-gates=APIV1MetasHandler=true
- --tls-cert=/var/certs/tls.crt
- --tls-key=/var/certs/tls.key
- --pull-cas-dir=/var/ca-certs
Expand Down Expand Up @@ -1680,7 +1681,8 @@ spec:
- --leader-elect
- --feature-gates=SyntheticPermissions=true
- --feature-gates=WebhookProviderCertManager=true
- --feature-gates=WebhookProviderOpenshiftServiceCA=true
- --feature-gates=SingleOwnNamespaceInstallSupport=true
- --feature-gates=PreflightPermissions=true
- --catalogd-cas-dir=/var/certs
- --pull-cas-dir=/var/certs
- --tls-cert=/var/certs/tls.cert
Expand Down
Loading