imagePullSecrets absent instead of empty

kubernetes/k8s-gencfg

@@ -12,11 +12,15 @@ def parse_file(args, input_file, output_file):
     with open(input_file) as file:
         input_data = file.read()
 
-    # IMAGE_SECRET is an optional argument
-    # ~ means null in yaml
     output_data = input_data.replace("{{IMAGE_PATH}}", args.image_path) \
-                  .replace("{{IMAGE_TAG}}", args.image_tag) \
-                  .replace("{{IMAGE_SECRET}}", args.image_secret if (args.image_secret != None) else "~") 
+                  .replace("{{IMAGE_TAG}}", args.image_tag) 
+
+    # IMAGE_SECRET is an optional argument
+    # but we don't want an empty value if the argument isn't provided
+    # so only add the field if the argument was provided
+    if (args.image_secret != None) and (output_file.endswith('-depl.yaml')):
+        output_data += '      imagePullSecrets:\n' \
+                       '      - name: %s' % args.image_secret 
 
     with open(output_file, "w") as file:
         file.write(output_data)

kubernetes/templates/astaire-depl.tmpl

@@ -50,6 +50,4 @@ spec:
       volumes:
       - name: astairelogs
         emptyDir: {}
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/bono-depl.tmpl

@@ -60,6 +60,4 @@ spec:
       volumes:
       - name: bonologs
         emptyDir: {}
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/cassandra-depl.tmpl

@@ -34,6 +34,4 @@ spec:
         readinessProbe:
           exec:
             command: ["/bin/bash", "/usr/share/kubernetes/liveness.sh", "7000 9042 9160"]
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/chronos-depl.tmpl

@@ -51,6 +51,4 @@ spec:
       volumes:
       - name: chronoslogs
         emptyDir: {}
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/ellis-depl.tmpl

@@ -31,6 +31,4 @@ spec:
         readinessProbe:
           tcpSocket:
             port: 80
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/etcd-depl.tmpl

@@ -55,6 +55,4 @@ spec:
         readinessProbe:
           tcpSocket:
             port: 4001
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/homer-depl.tmpl

@@ -31,6 +31,4 @@ spec:
         readinessProbe:
           tcpSocket:
             port: 7888
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/homestead-depl.tmpl

@@ -47,6 +47,4 @@ spec:
       volumes:
       - name: homesteadlogs
         emptyDir: {}
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/homestead-prov-depl.tmpl

@@ -35,6 +35,4 @@ spec:
         readinessProbe:
           exec:
             command: ["/bin/bash", "/usr/share/clearwater/bin/poll_homestead-prov.sh"]
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/ralf-depl.tmpl

@@ -47,6 +47,4 @@ spec:
       volumes:
       - name: ralflogs
         emptyDir: {}
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always

kubernetes/templates/sprout-depl.tmpl

@@ -47,6 +47,4 @@ spec:
       volumes:
       - name: sproutlogs
         emptyDir: {}
-      imagePullSecrets:
-      - name: {{IMAGE_SECRET}}
       restartPolicy: Always