Merge pull request #9304 from jboyd01/new-feature-gates

Add FeatureGates for NamespacedServiceBrokers and CatalogRestrictions

roles/openshift_service_catalog/defaults/main.yml

@@ -1,6 +1,10 @@
 ---
 openshift_service_catalog_remove: false
+
+# Feature Gates
 openshift_service_catalog_async_bindings_enabled: true
+openshift_service_catalog_namespaced_service_brokers_enabled: true
+
 openshift_service_catalog_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'service-catalog') }}"
 
 # Number of retries when waiting for the service catalog healthz to return 'ok' (retried every 10 seconds)

roles/openshift_service_catalog/templates/api_server.j2

@@ -47,6 +47,10 @@ spec:
         - KubernetesNamespaceLifecycle,DefaultServicePlan,ServiceBindingsLifecycle,ServicePlanChangeValidator,BrokerAuthSarCheck
         - --feature-gates
         - OriginatingIdentity=true
+{% if openshift_service_catalog_namespaced_service_brokers_enabled | bool %}
+        - --feature-gates
+        - NamespacedServiceBroker=true
+{% endif %}
         image: {{ openshift_service_catalog_image }}
         command: ["/usr/bin/service-catalog"]
         imagePullPolicy: IfNotPresent

roles/openshift_service_catalog/templates/controller_manager.j2

@@ -47,6 +47,10 @@ spec:
         - --feature-gates
         - AsyncBindingOperations=true
 {% endif %}
+{% if openshift_service_catalog_namespaced_service_brokers_enabled | bool %}
+        - --feature-gates
+        - NamespacedServiceBroker=true
+{% endif %}
         image: {{ openshift_service_catalog_image }}
         command: ["/usr/bin/service-catalog"]
         imagePullPolicy: IfNotPresent