summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstaebler <staebler@redhat.com>2017-10-26 12:24:24 -0400
committerstaebler <staebler@redhat.com>2017-10-26 12:25:08 -0400
commit8be96c4e20001f6e556be1ead161b7f348ba8990 (patch)
tree8e5b29cc8b789d8e3476a54b94c1ea90382c572a
parent34f6e3e2543ab961bcded8cbc7e531a7bbf5b02c (diff)
downloadopenshift-8be96c4e20001f6e556be1ead161b7f348ba8990.tar.gz
openshift-8be96c4e20001f6e556be1ead161b7f348ba8990.tar.bz2
openshift-8be96c4e20001f6e556be1ead161b7f348ba8990.tar.xz
openshift-8be96c4e20001f6e556be1ead161b7f348ba8990.zip
Update the name of the service-catalog binary
-rw-r--r--roles/openshift_service_catalog/templates/api_server.j23
-rw-r--r--roles/openshift_service_catalog/templates/controller_manager.j23
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: