Skip to content

Commit e4d7c2a

Browse files
authored
fixing formatting in container image to be consistent with image (#206)
Issue #, if available: N/A Description of changes: This PR aims to keep how `containerImage` tag is generated/built consistent and insync with how `image` tag in the cluster service version is generated. This makes readability of both sections of code/templates/sh's/etc the same and easier in the future if a change in the formate is needed. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent c484422 commit e4d7c2a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pkg/generate/olm/olm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func DefaultServiceConfig() ServiceConfig {
106106
SuggestedNamespace: "ack-system",
107107
ShortDescription: "This is the placeholder short description for the default configuration",
108108
IsCertified: false,
109-
ContainerImage: "public.ecr.aws/aws-controllers-k8s/",
109+
ContainerImage: "public.ecr.aws/aws-controllers-k8s",
110110
Support: "Community",
111111
},
112112
[]Sample{},

templates/config/manifests/bases/clusterserviceversion.yaml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
capabilities: {{.Annotations.CapabilityLevel}}
88
operatorframework.io/suggested-namespace: "ack-system"
99
repository: {{.Annotations.Repository}}
10-
containerImage: {{.Annotations.ContainerImage}}{{.ServiceIDClean}}-controller:v{{.Version}}
10+
containerImage: {{.Annotations.ContainerImage}}/{{.ServiceIDClean}}-controller:v{{.Version}}
1111
description: {{.Annotations.ShortDescription}}
1212
createdAt: {{.CreatedAt}}
1313
support: {{.Annotations.Support}}

0 commit comments

Comments
 (0)