Skip to content

Fix container image short names for OpenShift compatibility #3685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2025
Merged

Fix container image short names for OpenShift compatibility #3685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/controller/operators/olm/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/operators/operatorconditiongenerator_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
16 changes: 8 additions & 8 deletions pkg/controller/registry/reconciler/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
},
Expand All @@ -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,
},
Expand All @@ -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,
},
Expand All @@ -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,
},
Expand All @@ -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,
},
Expand All @@ -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,
Expand All @@ -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,
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/registry/resolver/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/catsrc_pod_config_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down