migrate to ICR (#162)

horis233 · web-flow · commit b0b6b639bb63 · 2022-04-28T20:43:02.000+08:00
* migrate to ICR

* fix lint error
diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/bundle-restricted/manifests/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml b/bundle-restricted/manifests/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml
@@ -22,7 +22,7 @@ metadata:
         }
       ]
     capabilities: Seamless Upgrades
-    containerImage: quay.io/opencloudio/ibm-namespace-scope-operator:latest
+    containerImage: icr.io/cpopen/ibm-namespace-scope-operator:latest
     createdAt: "2022-04-12T10:37:01Z"
     olm.skipRange: '<1.12.0'
     operators.operatorframework.io/builder: operator-sdk-v1.11.0+git
@@ -90,7 +90,7 @@ spec:
                     fieldRef:
                       apiVersion: v1
                       fieldPath: metadata.namespace
-                image: quay.io/opencloudio/ibm-namespace-scope-operator:latest
+                image: icr.io/cpopen/ibm-namespace-scope-operator:latest
                 imagePullPolicy: Always
                 name: ibm-namespace-scope-operator
                 resources:
@@ -157,6 +157,6 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: quay.io/opencloudio/ibm-namespace-scope-operator:1.12.0
+  - image: icr.io/cpopen/ibm-namespace-scope-operator:1.12.0
     name: IBM_NAMESPACE_SCOPE_OPERATOR_IMAGE
   version: 1.12.0
diff --git a/bundle/manifests/ibm-namespace-scope-operator.clusterserviceversion.yaml b/bundle/manifests/ibm-namespace-scope-operator.clusterserviceversion.yaml
@@ -22,7 +22,7 @@ metadata:
         }
       ]
     capabilities: Seamless Upgrades
-    containerImage: quay.io/opencloudio/ibm-namespace-scope-operator:latest
+    containerImage: icr.io/cpopen/ibm-namespace-scope-operator:latest
     createdAt: "2022-04-12T10:37:01Z"
     olm.skipRange: '<1.12.0'
     operators.operatorframework.io/builder: operator-sdk-v1.11.0+git
@@ -113,7 +113,7 @@ spec:
                     fieldRef:
                       apiVersion: v1
                       fieldPath: metadata.namespace
-                image: quay.io/opencloudio/ibm-namespace-scope-operator:latest
+                image: icr.io/cpopen/ibm-namespace-scope-operator:latest
                 imagePullPolicy: Always
                 name: ibm-namespace-scope-operator
                 resources:
@@ -157,6 +157,6 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: quay.io/opencloudio/ibm-namespace-scope-operator:1.12.0
+  - image: icr.io/cpopen/ibm-namespace-scope-operator:1.12.0
     name: IBM_NAMESPACE_SCOPE_OPERATOR_IMAGE
   version: 1.12.0
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -44,7 +44,7 @@ spec:
       containers:
       - command:
         - /namespace-scope-operator-manager
-        image: quay.io/opencloudio/ibm-namespace-scope-operator:latest
+        image: icr.io/cpopen/ibm-namespace-scope-operator:latest
         imagePullPolicy: Always
         name: ibm-namespace-scope-operator
         env:
diff --git a/config/manifests/bases/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml b/config/manifests/bases/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Seamless Upgrades
-    containerImage: quay.io/opencloudio/ibm-namespace-scope-operator:latest
+    containerImage: icr.io/cpopen/ibm-namespace-scope-operator:latest
     createdAt: "2020-11-2T15:38:33Z"
     operators.operatorframework.io/builder: operator-sdk-v1.1.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
@@ -53,6 +53,6 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: quay.io/opencloudio/ibm-namespace-scope-operator
+  - image: icr.io/cpopen/ibm-namespace-scope-operator
     name: IBM_NAMESPACE_SCOPE_OPERATOR_IMAGE
   version: 0.0.0
diff --git a/config/manifests/bases/ibm-namespace-scope-operator.clusterserviceversion.yaml b/config/manifests/bases/ibm-namespace-scope-operator.clusterserviceversion.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Seamless Upgrades
-    containerImage: quay.io/opencloudio/ibm-namespace-scope-operator:latest
+    containerImage: icr.io/cpopen/ibm-namespace-scope-operator:latest
     createdAt: "2020-11-2T15:38:33Z"
     operators.operatorframework.io/builder: operator-sdk-v1.1.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
@@ -54,6 +54,6 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: quay.io/opencloudio/ibm-namespace-scope-operator
+  - image: icr.io/cpopen/ibm-namespace-scope-operator
     name: IBM_NAMESPACE_SCOPE_OPERATOR_IMAGE
   version: 0.0.0
diff --git a/controllers/namespacescope_controller.go b/controllers/namespacescope_controller.go
@@ -765,6 +765,7 @@ func (r *NamespaceScopeReconciler) RestartPods(labels map[string]string, cm *cor
 	daemonSetNameList := make([]string, 0)
 	statefulSetNameList := make([]string, 0)
 	for _, pod := range podList.Items {
+		pod := pod
 		// Check if the pod is required to be refreshed
 		if !needRestart(pod, cm.Name) {
 			continue
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -50,7 +50,7 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+	logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/IBM/ibm-namespace-scope-operator
 
-go 1.17
+go 1.18
 
 require (
 	github.com/IBM/controller-filtered-cache v0.2.1
@@ -55,7 +55,7 @@ require (
 	golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect
 	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
-	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
+	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
 	golang.org/x/text v0.3.3 // indirect
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
diff --git a/go.sum b/go.sum
@@ -433,8 +433,9 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func TestAPIs(t *testing.T) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`var _ = BeforeSuite(func(done Done) {`
`53`		`- logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))`
	`53`	`+ logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))`
`54`	`54`
`55`	`55`	`By("bootstrapping test environment")`
`56`	`56`	`testEnv = &envtest.Environment{`