Skip to content

Commit 22a990c

Browse files
authored
Add more feature gate configuration to experimental (#2068)
Add the following feature gates to the experimental manifests: * APIV1MetasHandler * SingleOwnNamespaceInstallSupport * PReflightPermissions Update manifests Add the regular e2e tests into the experimental-e2e tests. This makes the experimental-e2e longer, but it should help with coverage. Signed-off-by: Todd Short <tshort@redhat.com>
1 parent 53e688c commit 22a990c

File tree

10 files changed

+51
-4
lines changed

10 files changed

+51
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ test-e2e: run image-registry prometheus e2e e2e-metrics e2e-coverage kind-clean
272272
test-experimental-e2e: SOURCE_MANIFEST := $(EXPERIMENTAL_E2E_MANIFEST)
273273
test-experimental-e2e: KIND_CLUSTER_NAME := operator-controller-e2e
274274
test-experimental-e2e: GO_BUILD_EXTRA_FLAGS := -cover
275-
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
275+
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
276276

277277
.PHONY: prometheus
278278
prometheus: PROMETHEUS_NAMESPACE := olmv1-system

config/components/base/experimental/kustomization.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ components:
1010
# EXPERIMENTAL FEATURES ARE LISTED HERE
1111
- ../../features/synthetic-user-permissions
1212
- ../../features/webhook-provider-certmanager
13-
- ../../features/webhook-provider-openshift-serviceca
13+
- ../../features/single-own-namespace
14+
- ../../features/preflight-permissions
15+
- ../../features/apiv1-metas-handler
16+
# This one is downstream only, so we shant use it
17+
# - ../../features/webhook-provider-openshift-serviceca
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# kustomization file for catalogd APIv1 metas handler
2+
# DO NOT ADD A NAMESPACE HERE
3+
apiVersion: kustomize.config.k8s.io/v1alpha1
4+
kind: Component
5+
patches:
6+
- target:
7+
kind: Deployment
8+
name: catalogd-controller-manager
9+
path: patches/enable-featuregate.yaml
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# enable APIv1 meta handler feature gate
2+
- op: add
3+
path: /spec/template/spec/containers/0/args/-
4+
value: "--feature-gates=APIV1MetasHandler=true"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# kustomization file for preflight permissions support
2+
# DO NOT ADD A NAMESPACE HERE
3+
apiVersion: kustomize.config.k8s.io/v1alpha1
4+
kind: Component
5+
patches:
6+
- target:
7+
kind: Deployment
8+
name: operator-controller-controller-manager
9+
path: patches/enable-featuregate.yaml
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# enable preflight permissions feature gate
2+
- op: add
3+
path: /spec/template/spec/containers/0/args/-
4+
value: "--feature-gates=PreflightPermissions=true"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# kustomization file for single/own namespace install support
2+
# DO NOT ADD A NAMESPACE HERE
3+
apiVersion: kustomize.config.k8s.io/v1alpha1
4+
kind: Component
5+
patches:
6+
- target:
7+
kind: Deployment
8+
name: operator-controller-controller-manager
9+
path: patches/enable-featuregate.yaml
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# enable single/own namespace install support feature gate
2+
- op: add
3+
path: /spec/template/spec/containers/0/args/-
4+
value: "--feature-gates=SingleOwnNamespaceInstallSupport=true"

manifests/experimental-e2e.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,7 @@ spec:
15961596
- --leader-elect
15971597
- --metrics-bind-address=:7443
15981598
- --external-address=catalogd-service.olmv1-system.svc
1599+
- --feature-gates=APIV1MetasHandler=true
15991600
- --tls-cert=/var/certs/tls.crt
16001601
- --tls-key=/var/certs/tls.key
16011602
- --pull-cas-dir=/var/ca-certs
@@ -1711,7 +1712,8 @@ spec:
17111712
- --leader-elect
17121713
- --feature-gates=SyntheticPermissions=true
17131714
- --feature-gates=WebhookProviderCertManager=true
1714-
- --feature-gates=WebhookProviderOpenshiftServiceCA=true
1715+
- --feature-gates=SingleOwnNamespaceInstallSupport=true
1716+
- --feature-gates=PreflightPermissions=true
17151717
- --catalogd-cas-dir=/var/certs
17161718
- --pull-cas-dir=/var/certs
17171719
- --tls-cert=/var/certs/tls.cert

manifests/experimental.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1573,6 +1573,7 @@ spec:
15731573
- --leader-elect
15741574
- --metrics-bind-address=:7443
15751575
- --external-address=catalogd-service.olmv1-system.svc
1576+
- --feature-gates=APIV1MetasHandler=true
15761577
- --tls-cert=/var/certs/tls.crt
15771578
- --tls-key=/var/certs/tls.key
15781579
- --pull-cas-dir=/var/ca-certs
@@ -1680,7 +1681,8 @@ spec:
16801681
- --leader-elect
16811682
- --feature-gates=SyntheticPermissions=true
16821683
- --feature-gates=WebhookProviderCertManager=true
1683-
- --feature-gates=WebhookProviderOpenshiftServiceCA=true
1684+
- --feature-gates=SingleOwnNamespaceInstallSupport=true
1685+
- --feature-gates=PreflightPermissions=true
16841686
- --catalogd-cas-dir=/var/certs
16851687
- --pull-cas-dir=/var/certs
16861688
- --tls-cert=/var/certs/tls.cert

0 commit comments

Comments
 (0)