diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-19 10:09:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 10:09:31 -0400 |
| commit | 8d527636729612c0b5fc80ad7e07ed2eae7ad561 (patch) | |
| tree | a99f914ce8e450ea2e541aefab5bc071a15a5f1a /roles/openshift_service_catalog/templates | |
| parent | 61cca52ea383d75aa4c20cf0e96936a5188084e9 (diff) | |
| parent | dc89e0fa2b3e5fa10027e93a1124ed6eeacad021 (diff) | |
| download | openshift-8d527636729612c0b5fc80ad7e07ed2eae7ad561.tar.gz openshift-8d527636729612c0b5fc80ad7e07ed2eae7ad561.tar.bz2 openshift-8d527636729612c0b5fc80ad7e07ed2eae7ad561.tar.xz openshift-8d527636729612c0b5fc80ad7e07ed2eae7ad561.zip | |
Merge pull request #5746 from staebler/Bug_1496694_new_resource_names
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 | 19 |
2 files changed, 21 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..2272cbb44 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 @@ -41,7 +46,19 @@ spec: protocol: TCP resources: {} terminationMessagePath: /dev/termination-log + volumeMounts: + - mountPath: /var/run/kubernetes-service-catalog + name: service-catalog-ssl + readOnly: true dnsPolicy: ClusterFirst restartPolicy: Always securityContext: {} terminationGracePeriodSeconds: 30 + volumes: + - name: service-catalog-ssl + secret: + defaultMode: 420 + items: + - key: tls.crt + path: apiserver.crt + secretName: apiserver-ssl |