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.

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:

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: