Merge branch 'master' into OCPBUGS-29729

Author: bentito

pkg/controller/registry/reconciler/reconciler.go

@@ -298,9 +298,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),

pkg/controller/registry/reconciler/reconciler_test.go

@@ -306,9 +306,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",