diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-27 19:56:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 19:56:51 -0700 |
| commit | a79b40290fc0be7f73a2e41e2a56543fec669ba1 (patch) | |
| tree | a87ca95933f371d674b6f8bc4f52c9e7e1478361 | |
| parent | bc00510f20bc516a0fcc738981ac60fd9c01ad5d (diff) | |
| parent | 8be96c4e20001f6e556be1ead161b7f348ba8990 (diff) | |
| download | openshift-a79b40290fc0be7f73a2e41e2a56543fec669ba1.tar.gz openshift-a79b40290fc0be7f73a2e41e2a56543fec669ba1.tar.bz2 openshift-a79b40290fc0be7f73a2e41e2a56543fec669ba1.tar.xz openshift-a79b40290fc0be7f73a2e41e2a56543fec669ba1.zip | |
Merge pull request #5899 from staebler/update_service_catalog_binary_name
Automatic merge from submit-queue.
Update the name of the service-catalog binary
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506541.
| -rw-r--r-- | roles/openshift_service_catalog/templates/api_server.j2 | 3 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/templates/controller_manager.j2 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_service_catalog/templates/api_server.j2 b/roles/openshift_service_catalog/templates/api_server.j2 index 5d5352c1c..0e5bb7230 100644 --- a/roles/openshift_service_catalog/templates/api_server.j2 +++ b/roles/openshift_service_catalog/templates/api_server.j2 @@ -24,6 +24,7 @@ spec: {% endfor %} containers: - args: + - apiserver - --storage-type - etcd - --secure-port @@ -45,7 +46,7 @@ spec: - --feature-gates - OriginatingIdentity=true image: {{ openshift_service_catalog_image_prefix }}service-catalog:{{ openshift_service_catalog_image_version }} - command: ["/usr/bin/apiserver"] + command: ["/usr/bin/service-catalog"] imagePullPolicy: Always name: apiserver ports: diff --git a/roles/openshift_service_catalog/templates/controller_manager.j2 b/roles/openshift_service_catalog/templates/controller_manager.j2 index 2272cbb44..e5e5f6b50 100644 --- a/roles/openshift_service_catalog/templates/controller_manager.j2 +++ b/roles/openshift_service_catalog/templates/controller_manager.j2 @@ -29,6 +29,7 @@ spec: fieldRef: fieldPath: metadata.namespace args: + - controller-manager - -v - "5" - --leader-election-namespace @@ -38,7 +39,7 @@ spec: - --feature-gates - OriginatingIdentity=true image: {{ openshift_service_catalog_image_prefix }}service-catalog:{{ openshift_service_catalog_image_version }} - command: ["/usr/bin/controller-manager"] + command: ["/usr/bin/service-catalog"] imagePullPolicy: Always name: controller-manager ports: |