diff options
| author | staebler <staebler@redhat.com> | 2017-10-13 01:00:04 -0400 |
|---|---|---|
| committer | staebler <staebler@redhat.com> | 2017-10-14 01:14:40 -0400 |
| commit | 3666062c46f13734937c2016d37ca43886bf449d (patch) | |
| tree | 16d7b282e06d8ad7e4605b0ff1f87606b066a001 /roles/openshift_service_catalog/templates | |
| parent | 60dc41f50ee3772d666dfe405c3c288cedec44a6 (diff) | |
| download | openshift-3666062c46f13734937c2016d37ca43886bf449d.tar.gz openshift-3666062c46f13734937c2016d37ca43886bf449d.tar.bz2 openshift-3666062c46f13734937c2016d37ca43886bf449d.tar.xz openshift-3666062c46f13734937c2016d37ca43886bf449d.zip | |
Update service catalog playbook for service-catalog rc1
Diffstat (limited to 'roles/openshift_service_catalog/templates')
| -rw-r--r-- | roles/openshift_service_catalog/templates/api_server.j2 | 4 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/templates/controller_manager.j2 | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/roles/openshift_service_catalog/templates/api_server.j2 b/roles/openshift_service_catalog/templates/api_server.j2 index c09834fd4..5d5352c1c 100644 --- a/roles/openshift_service_catalog/templates/api_server.j2 +++ b/roles/openshift_service_catalog/templates/api_server.j2 @@ -41,7 +41,9 @@ spec: - --cors-allowed-origins - {{ cors_allowed_origin }} - --admission-control - - "KubernetesNamespaceLifecycle" + - KubernetesNamespaceLifecycle,DefaultServicePlan,ServiceBindingsLifecycle,ServicePlanChangeValidator,BrokerAuthSarCheck + - --feature-gates + - OriginatingIdentity=true image: {{ openshift_service_catalog_image_prefix }}service-catalog:{{ openshift_service_catalog_image_version }} command: ["/usr/bin/apiserver"] imagePullPolicy: Always diff --git a/roles/openshift_service_catalog/templates/controller_manager.j2 b/roles/openshift_service_catalog/templates/controller_manager.j2 index 1bbc0fa2c..da52558f3 100644 --- a/roles/openshift_service_catalog/templates/controller_manager.j2 +++ b/roles/openshift_service_catalog/templates/controller_manager.j2 @@ -31,7 +31,12 @@ spec: args: - -v - "5" - - "--leader-election-namespace=$(K8S_NAMESPACE)" + - --leader-election-namespace + - kube-service-catalog + - --broker-relist-interval + - "5m" + - --feature-gates + - OriginatingIdentity=true image: {{ openshift_service_catalog_image_prefix }}service-catalog:{{ openshift_service_catalog_image_version }} command: ["/usr/bin/controller-manager"] imagePullPolicy: Always |