diff --git a/pkg/controller/operators/olm/operator_test.go b/pkg/controller/operators/olm/operator_test.go index 6d0f1c679b..f934194cb4 100644 --- a/pkg/controller/operators/olm/operator_test.go +++ b/pkg/controller/operators/olm/operator_test.go @@ -414,7 +414,7 @@ func deployment(deploymentName, namespace, serviceAccountName string, templateAn Containers: []corev1.Container{ { Name: deploymentName + "-c1", - Image: "nginx:1.7.9", + Image: "docker.io/nginx:1.7.9", Ports: []corev1.ContainerPort{ { ContainerPort: 80, @@ -681,7 +681,7 @@ func installStrategy(deploymentName string, permissions []v1alpha1.StrategyDeplo Containers: []corev1.Container{ { Name: deploymentName + "-c1", - Image: "nginx:1.7.9", + Image: "docker.io/nginx:1.7.9", Ports: []corev1.ContainerPort{ { ContainerPort: 80, diff --git a/pkg/controller/operators/operatorconditiongenerator_controller_test.go b/pkg/controller/operators/operatorconditiongenerator_controller_test.go index eb11813e4d..730f3a357c 100644 --- a/pkg/controller/operators/operatorconditiongenerator_controller_test.go +++ b/pkg/controller/operators/operatorconditiongenerator_controller_test.go @@ -260,7 +260,7 @@ func newNginxInstallStrategy(name string, permissions []operatorsv1alpha1.Strate Spec: corev1.PodSpec{Containers: []corev1.Container{ { Name: genName("nginx"), - Image: "bitnami/nginx:latest", + Image: "docker.io/bitnami/nginx:latest", Ports: []corev1.ContainerPort{{ContainerPort: 80}}, ImagePullPolicy: corev1.PullIfNotPresent, }, diff --git a/pkg/controller/registry/reconciler/reconciler_test.go b/pkg/controller/registry/reconciler/reconciler_test.go index 601eaaad22..4eb40925e4 100644 --- a/pkg/controller/registry/reconciler/reconciler_test.go +++ b/pkg/controller/registry/reconciler/reconciler_test.go @@ -1259,7 +1259,7 @@ func TestPodSchedulingOverrides(t *testing.T) { }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", }, }, expectedTolerations: nil, @@ -1275,7 +1275,7 @@ func TestPodSchedulingOverrides(t *testing.T) { }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", GrpcPodConfig: &v1alpha1.GrpcPodConfig{ NodeSelector: overriddenNodeSelectors, }, @@ -1294,7 +1294,7 @@ func TestPodSchedulingOverrides(t *testing.T) { }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", GrpcPodConfig: &v1alpha1.GrpcPodConfig{ PriorityClassName: &overriddenPriorityClassName, }, @@ -1313,7 +1313,7 @@ func TestPodSchedulingOverrides(t *testing.T) { }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", GrpcPodConfig: &v1alpha1.GrpcPodConfig{ PriorityClassName: nil, }, @@ -1332,7 +1332,7 @@ func TestPodSchedulingOverrides(t *testing.T) { }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", GrpcPodConfig: &v1alpha1.GrpcPodConfig{ Tolerations: overriddenTolerations, }, @@ -1351,7 +1351,7 @@ func TestPodSchedulingOverrides(t *testing.T) { }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", GrpcPodConfig: &v1alpha1.GrpcPodConfig{ Affinity: overriddenAffinity, }, @@ -1370,7 +1370,7 @@ func TestPodSchedulingOverrides(t *testing.T) { }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", GrpcPodConfig: &v1alpha1.GrpcPodConfig{ NodeSelector: overriddenNodeSelectors, PriorityClassName: &overriddenPriorityClassName, @@ -1392,7 +1392,7 @@ func TestPodSchedulingOverrides(t *testing.T) { }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", GrpcPodConfig: &v1alpha1.GrpcPodConfig{ PriorityClassName: &overriddenPriorityClassName, }, diff --git a/pkg/controller/registry/resolver/util_test.go b/pkg/controller/registry/resolver/util_test.go index 01cc473d5e..b088106520 100644 --- a/pkg/controller/registry/resolver/util_test.go +++ b/pkg/controller/registry/resolver/util_test.go @@ -45,7 +45,7 @@ func csv(name, replaces string, ownedCRDs, requiredCRDs, ownedAPIServices, requi Containers: []corev1.Container{ { Name: name + "-c1", - Image: "nginx:1.7.9", + Image: "docker.io/nginx:1.7.9", Ports: []corev1.ContainerPort{ { ContainerPort: 80, diff --git a/test/e2e/catsrc_pod_config_e2e_test.go b/test/e2e/catsrc_pod_config_e2e_test.go index 50930d5e64..1af18e465c 100644 --- a/test/e2e/catsrc_pod_config_e2e_test.go +++ b/test/e2e/catsrc_pod_config_e2e_test.go @@ -55,7 +55,7 @@ var _ = Describe("CatalogSource Grpc Pod Config", Label("CatalogSourcePodConfig" }, Spec: v1alpha1.CatalogSourceSpec{ SourceType: v1alpha1.SourceTypeGrpc, - Image: "repo/image:tag", + Image: "docker.io/repo/image:tag", GrpcPodConfig: &v1alpha1.GrpcPodConfig{ SecurityContextConfig: v1alpha1.Restricted, }, diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 7deb176552..fe058c41ff 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -46,7 +46,7 @@ var ( dummyImage = flag.String( "dummyImage", - "bitnami/nginx:latest", + "docker.io/bitnami/nginx:latest", "dummy image to treat as an operator in tests", )