From a7b38078c9200027c086324ab60d4e1e96010456 Mon Sep 17 00:00:00 2001
From: Eguzki Astiz Lezaun <eastizle@redhat.com>
Date: Wed, 29 Jun 2022 15:12:11 +0200
Subject: [PATCH 1/2] APIManagerRestore: fix domain resync command line

Additionally upgrade origin-cli image to 4.7
---
 pkg/3scale/amp/component/images.go | 2 +-
 pkg/restore/apimanager_restore.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/3scale/amp/component/images.go b/pkg/3scale/amp/component/images.go
index 076e62f6b..81bb26dba 100644
--- 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
index d735459be..68e7849ba 100644
--- 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"
 `
 }
 

From 0edd867696df676789e5798937f4238a9b214761 Mon Sep 17 00:00:00 2001
From: Eguzki Astiz Lezaun <eastizle@redhat.com>
Date: Wed, 29 Jun 2022 15:13:23 +0200
Subject: [PATCH 2/2] update manifests and bundle

---
 bundle/manifests/3scale-operator.clusterserviceversion.yaml | 2 +-
 config/manager/manager.yaml                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundle/manifests/3scale-operator.clusterserviceversion.yaml b/bundle/manifests/3scale-operator.clusterserviceversion.yaml
index 0a99678ae..85d66ee5f 100644
--- 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
index b038410e1..0492f1fd3 100644
--- 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