Merge pull request #769 from 3scale/backport-768-THREESCALE-8476-fix-domain-resync-command-line

[Backport 768] THREESCALE-8476 fix domain resync command line

Author: eguzki

bundle/manifests/3scale-operator.clusterserviceversion.yaml

@@ -375,7 +375,7 @@ spec:
                 - name: RELATED_IMAGE_ZYNC_POSTGRESQL
                   value: centos/postgresql-10-centos7
                 - name: RELATED_IMAGE_OC_CLI
-                  value: quay.io/openshift/origin-cli:4.2
+                  value: quay.io/openshift/origin-cli:4.7
                 image: quay.io/3scale/3scale-operator:master
                 name: manager
                 ports:

config/manager/manager.yaml

@@ -70,5 +70,5 @@ spec:
         - name: RELATED_IMAGE_ZYNC_POSTGRESQL
           value: "centos/postgresql-10-centos7"
         - name: RELATED_IMAGE_OC_CLI
-          value: "quay.io/openshift/origin-cli:4.2"
+          value: "quay.io/openshift/origin-cli:4.7"
       terminationGracePeriodSeconds: 10

pkg/3scale/amp/component/images.go

@@ -41,5 +41,5 @@ func ZyncPostgreSQLImageURL() string {
 }
 
 func OCCLIImageURL() string {
-	return "quay.io/openshift/origin-cli:4.2"
+	return "quay.io/openshift/origin-cli:4.7"
 }

pkg/restore/apimanager_restore.go

@@ -402,7 +402,7 @@ func (b *APIManagerRestore) zyncResyncDomainsContainerArgs() string {
 		exit 1
 	fi
 	podname=$(echo -n $dcpods | awk '{print $1}')
-	oc exec ${podname} bash -- -c "bundle exec rake zync:resync:domains"
+	oc exec ${podname} -- bash -c "bundle exec rake zync:resync:domains"
 `
 }