Merge pull request #709 from openshift-bot/synchronize-upstream

OCPBUGS-30132: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go

@@ -285,9 +285,10 @@ func Pod(source *operatorsv1alpha1.CatalogSource, name, opmImg, utilImage, img s
 				Args:         []string{"/bin/copy-content", fmt.Sprintf("%s/copy-content", utilitiesPath)},
 				VolumeMounts: []corev1.VolumeMount{utilitiesVolumeMount},
 			}, corev1.Container{
-				Name:    "extract-content",
-				Image:   img,
-				Command: []string{utilitiesPath + "/copy-content"},
+				Name:            "extract-content",
+				Image:           img,
+				ImagePullPolicy: image.InferImagePullPolicy(img),
+				Command:         []string{utilitiesPath + "/copy-content"},
 				Args: []string{
 					"--catalog.from=" + grpcPodConfig.ExtractContent.CatalogDir,
 					"--catalog.to=" + fmt.Sprintf("%s/catalog", catalogPath),

staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler_test.go

@@ -277,7 +277,7 @@ func TestPodExtractContent(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					GenerateName: "test-",
 					Namespace:    "testns",
-					Labels:       map[string]string{"olm.pod-spec-hash": "6AsUxiAHW383luxWxmVVATFBeHXKNIX0HXrP5g", "olm.managed": "true"},
+					Labels:       map[string]string{"olm.pod-spec-hash": "2AHzz8IDqQLwPsDyu4UjUmnROr4E59PMKm9OCm", "olm.managed": "true"},
 					Annotations:  map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
 				},
 				Spec: corev1.PodSpec{
@@ -300,9 +300,10 @@ func TestPodExtractContent(t *testing.T) {
 							VolumeMounts: []corev1.VolumeMount{{Name: "utilities", MountPath: "/utilities"}},
 						},
 						{
-							Name:    "extract-content",
-							Image:   "image",
-							Command: []string{"/utilities/copy-content"},
+							Name:            "extract-content",
+							Image:           "image",
+							ImagePullPolicy: image.InferImagePullPolicy("image"),
+							Command:         []string{"/utilities/copy-content"},
 							Args: []string{
 								"--catalog.from=/catalog",
 								"--catalog.to=/extracted-catalog/catalog",