Merge pull request #163 from vshn/fix/pullsecret

Fix pullsecret reference naming

Author: martini-source

internal/output.go

@@ -89,7 +89,11 @@ func WriteManifests(outputDir string, objects converter.Objects) error {
 	logrus.Infof("wrote %d persistentVolumeClaims\n", len(objects.PersistentVolumeClaims))
 
 	for _, secret := range objects.Secrets {
-		err := writeManifest(&secret, outputDir+"/"+secret.Name+"-secret.yaml")
+		manifestName := secret.Name
+		if !strings.HasSuffix(manifestName, "-secret") {
+			manifestName += "-secret"
+		}
+		err := writeManifest(&secret, outputDir+"/"+manifestName+".yaml")
 		if err != nil {
 			return err
 		}

pkg/converter/converter.go

@@ -163,7 +163,7 @@ func composeServiceToPullSecret(authConf string, name string, labels map[string]
 	secret.APIVersion = "v1"
 	secret.Kind = "Secret"
 	secret.Type = core.SecretTypeDockerConfigJson
-	secret.Name = name + "-image-pull"
+	secret.Name = name + "-image-pull-secret"
 	secret.Labels = labels
 	secret.Annotations = util.Annotations(labels, "Secret")
 	secret.StringData = map[string]string{".dockerconfigjson": authConf}
@@ -292,7 +292,7 @@ func composeServiceToPodTemplate(
 			workload.Name+refSlug,
 			labels)
 		secrets = append(secrets, *imagePullSecret)
-		imagePullSecretReference = append(imagePullSecretReference, core.LocalObjectReference{Name: imagePullSecret.Name + "-secret"})
+		imagePullSecretReference = append(imagePullSecretReference, core.LocalObjectReference{Name: imagePullSecret.Name})
 	}
 	for _, part := range workload.GetParts() {
 		c, s, cvs := composeServiceToContainer(part, refSlug, projectVolumes, labels)
@@ -306,7 +306,7 @@ func composeServiceToPodTemplate(
 				part.Name+refSlug,
 				labels)
 			secrets = append(secrets, *imagePullSecret)
-			imagePullSecretReference = append(imagePullSecretReference, core.LocalObjectReference{Name: imagePullSecret.Name + "-secret"})
+			imagePullSecretReference = append(imagePullSecretReference, core.LocalObjectReference{Name: imagePullSecret.Name})
 
 		}
 		maps.Copy(volumes, cvs)

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

@@ -5,7 +5,7 @@ metadata:
   labels:
     k8ify.ref-slug: oasp
     k8ify.service: part-of-deployment
-  name: part-of-deployment-oasp-image-pull
+  name: part-of-deployment-oasp-image-pull-secret
 stringData:
   .dockerconfigjson: |
     {

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

@@ -5,7 +5,7 @@ metadata:
   labels:
     k8ify.ref-slug: oasp
     k8ify.service: part-of-deployment
-  name: part-of-deployment-sidecar-oasp-image-pull
+  name: part-of-deployment-sidecar-oasp-image-pull-secret
 stringData:
   .dockerconfigjson: |
     {

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

@@ -4,7 +4,7 @@ metadata:
   creationTimestamp: null
   labels:
     k8ify.service: part-of-statefulset
-  name: part-of-statefulset-image-pull
+  name: part-of-statefulset-image-pull-secret
 stringData:
   .dockerconfigjson: |
     {

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

@@ -4,7 +4,7 @@ metadata:
   creationTimestamp: null
   labels:
     k8ify.service: part-of-statefulset
-  name: part-of-statefulset-sidecar-image-pull
+  name: part-of-statefulset-sidecar-image-pull-secret
 stringData:
   .dockerconfigjson: |
     {

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

@@ -5,7 +5,7 @@ metadata:
   labels:
     k8ify.ref-slug: oasp
     k8ify.service: regular-deployment
-  name: regular-deployment-oasp-image-pull
+  name: regular-deployment-oasp-image-pull-secret
 stringData:
   .dockerconfigjson: |
     {

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

@@ -4,7 +4,7 @@ metadata:
   creationTimestamp: null
   labels:
     k8ify.service: regular-statefulset
-  name: regular-statefulset-image-pull
+  name: regular-statefulset-image-pull-secret
 stringData:
   .dockerconfigjson: |
     {