Skip to content

Commit ae3783f

Browse files
Merge pull request #163 from vshn/fix/pullsecret
Fix pullsecret reference naming
2 parents 984d445 + 93e5564 commit ae3783f

8 files changed

+14
-10
lines changed

internal/output.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ func WriteManifests(outputDir string, objects converter.Objects) error {
8989
logrus.Infof("wrote %d persistentVolumeClaims\n", len(objects.PersistentVolumeClaims))
9090

9191
for _, secret := range objects.Secrets {
92-
err := writeManifest(&secret, outputDir+"/"+secret.Name+"-secret.yaml")
92+
manifestName := secret.Name
93+
if !strings.HasSuffix(manifestName, "-secret") {
94+
manifestName += "-secret"
95+
}
96+
err := writeManifest(&secret, outputDir+"/"+manifestName+".yaml")
9397
if err != nil {
9498
return err
9599
}

pkg/converter/converter.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func composeServiceToPullSecret(authConf string, name string, labels map[string]
163163
secret.APIVersion = "v1"
164164
secret.Kind = "Secret"
165165
secret.Type = core.SecretTypeDockerConfigJson
166-
secret.Name = name + "-image-pull"
166+
secret.Name = name + "-image-pull-secret"
167167
secret.Labels = labels
168168
secret.Annotations = util.Annotations(labels, "Secret")
169169
secret.StringData = map[string]string{".dockerconfigjson": authConf}
@@ -292,7 +292,7 @@ func composeServiceToPodTemplate(
292292
workload.Name+refSlug,
293293
labels)
294294
secrets = append(secrets, *imagePullSecret)
295-
imagePullSecretReference = append(imagePullSecretReference, core.LocalObjectReference{Name: imagePullSecret.Name + "-secret"})
295+
imagePullSecretReference = append(imagePullSecretReference, core.LocalObjectReference{Name: imagePullSecret.Name})
296296
}
297297
for _, part := range workload.GetParts() {
298298
c, s, cvs := composeServiceToContainer(part, refSlug, projectVolumes, labels)
@@ -306,7 +306,7 @@ func composeServiceToPodTemplate(
306306
part.Name+refSlug,
307307
labels)
308308
secrets = append(secrets, *imagePullSecret)
309-
imagePullSecretReference = append(imagePullSecretReference, core.LocalObjectReference{Name: imagePullSecret.Name + "-secret"})
309+
imagePullSecretReference = append(imagePullSecretReference, core.LocalObjectReference{Name: imagePullSecret.Name})
310310

311311
}
312312
maps.Copy(volumes, cvs)

tests/golden/imagepullsecrets/manifests/part-of-deployment-oasp-image-pull-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
k8ify.ref-slug: oasp
77
k8ify.service: part-of-deployment
8-
name: part-of-deployment-oasp-image-pull
8+
name: part-of-deployment-oasp-image-pull-secret
99
stringData:
1010
.dockerconfigjson: |
1111
{

tests/golden/imagepullsecrets/manifests/part-of-deployment-sidecar-oasp-image-pull-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
k8ify.ref-slug: oasp
77
k8ify.service: part-of-deployment
8-
name: part-of-deployment-sidecar-oasp-image-pull
8+
name: part-of-deployment-sidecar-oasp-image-pull-secret
99
stringData:
1010
.dockerconfigjson: |
1111
{

tests/golden/imagepullsecrets/manifests/part-of-statefulset-image-pull-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
creationTimestamp: null
55
labels:
66
k8ify.service: part-of-statefulset
7-
name: part-of-statefulset-image-pull
7+
name: part-of-statefulset-image-pull-secret
88
stringData:
99
.dockerconfigjson: |
1010
{

tests/golden/imagepullsecrets/manifests/part-of-statefulset-sidecar-image-pull-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
creationTimestamp: null
55
labels:
66
k8ify.service: part-of-statefulset
7-
name: part-of-statefulset-sidecar-image-pull
7+
name: part-of-statefulset-sidecar-image-pull-secret
88
stringData:
99
.dockerconfigjson: |
1010
{

tests/golden/imagepullsecrets/manifests/regular-deployment-oasp-image-pull-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
k8ify.ref-slug: oasp
77
k8ify.service: regular-deployment
8-
name: regular-deployment-oasp-image-pull
8+
name: regular-deployment-oasp-image-pull-secret
99
stringData:
1010
.dockerconfigjson: |
1111
{

tests/golden/imagepullsecrets/manifests/regular-statefulset-image-pull-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
creationTimestamp: null
55
labels:
66
k8ify.service: regular-statefulset
7-
name: regular-statefulset-image-pull
7+
name: regular-statefulset-image-pull-secret
88
stringData:
99
.dockerconfigjson: |
1010
{

0 commit comments

Comments
 (0)