diff --git a/helm/experimental.yaml b/helm/experimental.yaml index d5fe64b22..9db3a4a1d 100644 --- a/helm/experimental.yaml +++ b/helm/experimental.yaml @@ -11,13 +11,15 @@ options: replicas: 2 features: enabled: - - SingleOwnNamespaceInstallSupport - - PreflightPermissions - - HelmChartSupport - BoxcutterRuntime - - DeploymentConfig - BundleReleaseSupport + - DeploymentConfig + - HelmChartSupport + - PreflightPermissions + - SingleOwnNamespaceInstallSupport + - WebhookProviderCertManager disabled: + - SyntheticPermissions - WebhookProviderOpenshiftServiceCA # List of enabled experimental features for catalogd # Use with {{- if has "FeatureGate" .Values.options.catalogd.features.enabled }} @@ -28,5 +30,6 @@ options: features: enabled: - APIV1MetasHandler + disabled: [] # This can be one of: standard or experimental featureSet: experimental diff --git a/helm/olmv1/values.yaml b/helm/olmv1/values.yaml index c5845b9a1..1458be7d2 100644 --- a/helm/olmv1/values.yaml +++ b/helm/olmv1/values.yaml @@ -11,8 +11,17 @@ options: replicas: 1 extraArguments: [] features: - enabled: [] - disabled: [] + enabled: + - WebhookProviderCertManager + disabled: + - BoxcutterRuntime + - BundleReleaseSupport + - DeploymentConfig + - HelmChartSupport + - PreflightPermissions + - SingleOwnNamespaceInstallSupport + - SyntheticPermissions + - WebhookProviderOpenshiftServiceCA podDisruptionBudget: enabled: true minAvailable: 1 @@ -24,7 +33,8 @@ options: extraArguments: [] features: enabled: [] - disabled: [] + disabled: + - APIV1MetasHandler podDisruptionBudget: enabled: true minAvailable: 1 diff --git a/manifests/experimental-e2e.yaml b/manifests/experimental-e2e.yaml index 6c3aa302e..df8f0b7b0 100644 --- a/manifests/experimental-e2e.yaml +++ b/manifests/experimental-e2e.yaml @@ -2823,12 +2823,14 @@ spec: - --metrics-bind-address=:8443 - --pprof-bind-address=:6060 - --leader-elect - - --feature-gates=SingleOwnNamespaceInstallSupport=true - - --feature-gates=PreflightPermissions=true - - --feature-gates=HelmChartSupport=true - --feature-gates=BoxcutterRuntime=true - - --feature-gates=DeploymentConfig=true - --feature-gates=BundleReleaseSupport=true + - --feature-gates=DeploymentConfig=true + - --feature-gates=HelmChartSupport=true + - --feature-gates=PreflightPermissions=true + - --feature-gates=SingleOwnNamespaceInstallSupport=true + - --feature-gates=WebhookProviderCertManager=true + - --feature-gates=SyntheticPermissions=false - --feature-gates=WebhookProviderOpenshiftServiceCA=false - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key diff --git a/manifests/experimental.yaml b/manifests/experimental.yaml index 954fcd274..31343e5c4 100644 --- a/manifests/experimental.yaml +++ b/manifests/experimental.yaml @@ -2729,12 +2729,14 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=:8443 - --leader-elect - - --feature-gates=SingleOwnNamespaceInstallSupport=true - - --feature-gates=PreflightPermissions=true - - --feature-gates=HelmChartSupport=true - --feature-gates=BoxcutterRuntime=true - - --feature-gates=DeploymentConfig=true - --feature-gates=BundleReleaseSupport=true + - --feature-gates=DeploymentConfig=true + - --feature-gates=HelmChartSupport=true + - --feature-gates=PreflightPermissions=true + - --feature-gates=SingleOwnNamespaceInstallSupport=true + - --feature-gates=WebhookProviderCertManager=true + - --feature-gates=SyntheticPermissions=false - --feature-gates=WebhookProviderOpenshiftServiceCA=false - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key diff --git a/manifests/standard-e2e.yaml b/manifests/standard-e2e.yaml index 66c65b5ae..6f55abc17 100644 --- a/manifests/standard-e2e.yaml +++ b/manifests/standard-e2e.yaml @@ -1805,6 +1805,7 @@ spec: - --metrics-bind-address=:7443 - --pprof-bind-address=:6060 - --external-address=catalogd-service.olmv1-system.svc + - --feature-gates=APIV1MetasHandler=false - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key - --pull-cas-dir=/var/ca-certs @@ -1955,6 +1956,15 @@ spec: - --metrics-bind-address=:8443 - --pprof-bind-address=:6060 - --leader-elect + - --feature-gates=WebhookProviderCertManager=true + - --feature-gates=BoxcutterRuntime=false + - --feature-gates=BundleReleaseSupport=false + - --feature-gates=DeploymentConfig=false + - --feature-gates=HelmChartSupport=false + - --feature-gates=PreflightPermissions=false + - --feature-gates=SingleOwnNamespaceInstallSupport=false + - --feature-gates=SyntheticPermissions=false + - --feature-gates=WebhookProviderOpenshiftServiceCA=false - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key - --catalogd-cas-dir=/var/ca-certs diff --git a/manifests/standard.yaml b/manifests/standard.yaml index 84b940f5e..870f10e3f 100644 --- a/manifests/standard.yaml +++ b/manifests/standard.yaml @@ -1724,6 +1724,7 @@ spec: - --leader-elect - --metrics-bind-address=:7443 - --external-address=catalogd-service.olmv1-system.svc + - --feature-gates=APIV1MetasHandler=false - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key - --pull-cas-dir=/var/ca-certs @@ -1861,6 +1862,15 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=:8443 - --leader-elect + - --feature-gates=WebhookProviderCertManager=true + - --feature-gates=BoxcutterRuntime=false + - --feature-gates=BundleReleaseSupport=false + - --feature-gates=DeploymentConfig=false + - --feature-gates=HelmChartSupport=false + - --feature-gates=PreflightPermissions=false + - --feature-gates=SingleOwnNamespaceInstallSupport=false + - --feature-gates=SyntheticPermissions=false + - --feature-gates=WebhookProviderOpenshiftServiceCA=false - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key - --catalogd-cas-dir=/var/ca-certs