Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 465ea2e

Browse files
authored
Fix container image short names for OpenShift compatibility (#3685)
Replace short image names (nginx:*, bitnami/nginx:*, repo/image:*) with fully qualified names (docker.io/*) in tests to resolve failures in OpenShift clusters with container image short name enforcement enabled.
1 parent ce26d16 commit 465ea2e

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

‎pkg/controller/operators/olm/operator_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ func deployment(deploymentName, namespace, serviceAccountName string, templateAn
414414
Containers: []corev1.Container{
415415
{
416416
Name: deploymentName + "-c1",
417-
Image: "nginx:1.7.9",
417+
Image: "docker.io/nginx:1.7.9",
418418
Ports: []corev1.ContainerPort{
419419
{
420420
ContainerPort: 80,
@@ -681,7 +681,7 @@ func installStrategy(deploymentName string, permissions []v1alpha1.StrategyDeplo
681681
Containers: []corev1.Container{
682682
{
683683
Name: deploymentName + "-c1",
684-
Image: "nginx:1.7.9",
684+
Image: "docker.io/nginx:1.7.9",
685685
Ports: []corev1.ContainerPort{
686686
{
687687
ContainerPort: 80,

‎pkg/controller/operators/operatorconditiongenerator_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func newNginxInstallStrategy(name string, permissions []operatorsv1alpha1.Strate
260260
Spec: corev1.PodSpec{Containers: []corev1.Container{
261261
{
262262
Name: genName("nginx"),
263-
Image: "bitnami/nginx:latest",
263+
Image: "docker.io/bitnami/nginx:latest",
264264
Ports: []corev1.ContainerPort{{ContainerPort: 80}},
265265
ImagePullPolicy: corev1.PullIfNotPresent,
266266
},

‎pkg/controller/registry/reconciler/reconciler_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
12591259
},
12601260
Spec: v1alpha1.CatalogSourceSpec{
12611261
SourceType: v1alpha1.SourceTypeGrpc,
1262-
Image: "repo/image:tag",
1262+
Image: "docker.io/repo/image:tag",
12631263
},
12641264
},
12651265
expectedTolerations: nil,
@@ -1275,7 +1275,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
12751275
},
12761276
Spec: v1alpha1.CatalogSourceSpec{
12771277
SourceType: v1alpha1.SourceTypeGrpc,
1278-
Image: "repo/image:tag",
1278+
Image: "docker.io/repo/image:tag",
12791279
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
12801280
NodeSelector: overriddenNodeSelectors,
12811281
},
@@ -1294,7 +1294,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
12941294
},
12951295
Spec: v1alpha1.CatalogSourceSpec{
12961296
SourceType: v1alpha1.SourceTypeGrpc,
1297-
Image: "repo/image:tag",
1297+
Image: "docker.io/repo/image:tag",
12981298
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
12991299
PriorityClassName: &overriddenPriorityClassName,
13001300
},
@@ -1313,7 +1313,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
13131313
},
13141314
Spec: v1alpha1.CatalogSourceSpec{
13151315
SourceType: v1alpha1.SourceTypeGrpc,
1316-
Image: "repo/image:tag",
1316+
Image: "docker.io/repo/image:tag",
13171317
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
13181318
PriorityClassName: nil,
13191319
},
@@ -1332,7 +1332,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
13321332
},
13331333
Spec: v1alpha1.CatalogSourceSpec{
13341334
SourceType: v1alpha1.SourceTypeGrpc,
1335-
Image: "repo/image:tag",
1335+
Image: "docker.io/repo/image:tag",
13361336
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
13371337
Tolerations: overriddenTolerations,
13381338
},
@@ -1351,7 +1351,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
13511351
},
13521352
Spec: v1alpha1.CatalogSourceSpec{
13531353
SourceType: v1alpha1.SourceTypeGrpc,
1354-
Image: "repo/image:tag",
1354+
Image: "docker.io/repo/image:tag",
13551355
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
13561356
Affinity: overriddenAffinity,
13571357
},
@@ -1370,7 +1370,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
13701370
},
13711371
Spec: v1alpha1.CatalogSourceSpec{
13721372
SourceType: v1alpha1.SourceTypeGrpc,
1373-
Image: "repo/image:tag",
1373+
Image: "docker.io/repo/image:tag",
13741374
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
13751375
NodeSelector: overriddenNodeSelectors,
13761376
PriorityClassName: &overriddenPriorityClassName,
@@ -1392,7 +1392,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
13921392
},
13931393
Spec: v1alpha1.CatalogSourceSpec{
13941394
SourceType: v1alpha1.SourceTypeGrpc,
1395-
Image: "repo/image:tag",
1395+
Image: "docker.io/repo/image:tag",
13961396
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
13971397
PriorityClassName: &overriddenPriorityClassName,
13981398
},

‎pkg/controller/registry/resolver/util_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func csv(name, replaces string, ownedCRDs, requiredCRDs, ownedAPIServices, requi
4545
Containers: []corev1.Container{
4646
{
4747
Name: name + "-c1",
48-
Image: "nginx:1.7.9",
48+
Image: "docker.io/nginx:1.7.9",
4949
Ports: []corev1.ContainerPort{
5050
{
5151
ContainerPort: 80,

‎test/e2e/catsrc_pod_config_e2e_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var _ = Describe("CatalogSource Grpc Pod Config", Label("CatalogSourcePodConfig"
5555
},
5656
Spec: v1alpha1.CatalogSourceSpec{
5757
SourceType: v1alpha1.SourceTypeGrpc,
58-
Image: "repo/image:tag",
58+
Image: "docker.io/repo/image:tag",
5959
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
6060
SecurityContextConfig: v1alpha1.Restricted,
6161
},

‎test/e2e/e2e_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var (
4646

4747
dummyImage = flag.String(
4848
"dummyImage",
49-
"bitnami/nginx:latest",
49+
"docker.io/bitnami/nginx:latest",
5050
"dummy image to treat as an operator in tests",
5151
)
5252

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /