Merge pull request #769 from 3scale/backport-768-THREESCALE-8476-fix-…

…domain-resync-command-line [Backport 768] THREESCALE-8476 fix domain resync command line
3scale · Jun 29, 2022 · a2e70c7 · a2e70c7
2 parents b47d255 + 0edd867
commit a2e70c7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bundle/manifests/3scale-operator.clusterserviceversion.yaml b/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:

diff --git a/config/manager/manager.yaml b/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
diff --git a/pkg/3scale/amp/component/images.go b/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"
 }
diff --git a/pkg/restore/apimanager_restore.go b/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"
 `
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		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"
     `
     }
@@ Expand Down @@