Merge pull request #115 from gimlet-io/image-pull-secrets-schema-values

Image pull secrets schema values
gimlet-io · Feb 1, 2024 · dde74f2 · dde74f2
2 parents 933a10b + 373b6e9
commit dde74f2
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 11 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -15,4 +15,4 @@ type: library
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0
+version: 0.5.1
diff --git a/charts/common/templates/_podSpec.yaml b/charts/common/templates/_podSpec.yaml
@@ -1,7 +1,9 @@
 {{- define "common.podSpec.tpl" -}}
 {{- with .Values.imagePullSecrets }}
 imagePullSecrets:
-  {{- toYaml . | nindent 2 }}
+  {{- range . }}  
+  - name: {{ . }}
+  {{- end }}
 {{- end }}
 securityContext:
   {{- toYaml .Values.podSecurityContext | nindent 2 }}

diff --git a/charts/cron-job/Chart.lock b/charts/cron-job/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.5.0
-digest: sha256:30d2b6050fd6d3ce739c4a1b549f16713ad778669467e767ddf1fc67bc1114d4
-generated: "2023-12-18T16:50:56.069352+01:00"
+  version: 0.5.1
+digest: sha256:ca23e74d63ca4339e8720d1af3709107d1d5831c5f9e78d9ae88107a2590c826
+generated: "2024-02-01T13:22:33.441381+01:00"
diff --git a/charts/cron-job/Chart.yaml b/charts/cron-job/Chart.yaml
@@ -19,5 +19,5 @@ version: 0.64.0
 
 dependencies:
   - name: common
-    version: 0.5.0
+    version: 0.5.1
     repository: file://../common
diff --git a/charts/cron-job/charts/common-0.5.0.tgz b/charts/cron-job/charts/common-0.5.0.tgz
diff --git a/charts/cron-job/charts/common-0.5.1.tgz b/charts/cron-job/charts/common-0.5.1.tgz
diff --git a/charts/onechart/Chart.lock b/charts/onechart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.5.0
-digest: sha256:30d2b6050fd6d3ce739c4a1b549f16713ad778669467e767ddf1fc67bc1114d4
-generated: "2023-12-18T13:46:34.090227+01:00"
+  version: 0.5.1
+digest: sha256:ca23e74d63ca4339e8720d1af3709107d1d5831c5f9e78d9ae88107a2590c826
+generated: "2024-02-01T13:22:32.899733+01:00"
diff --git a/charts/onechart/Chart.yaml b/charts/onechart/Chart.yaml
@@ -19,5 +19,5 @@ version: 0.64.0
 
 dependencies:
   - name: common
-    version: 0.5.0
+    version: 0.5.1
     repository: file://../common
diff --git a/charts/onechart/charts/common-0.5.0.tgz b/charts/onechart/charts/common-0.5.0.tgz
diff --git a/charts/onechart/charts/common-0.5.1.tgz b/charts/onechart/charts/common-0.5.1.tgz
diff --git a/charts/onechart/helm-ui.json b/charts/onechart/helm-ui.json
@@ -3,11 +3,17 @@
     "schemaIDs": [
       "#/properties/image",
       "#/properties/containerPort",
+      "#/properties/imagePullSecrets",
       "#/properties/replicas"
     ],
     "uiSchema": {
       "#/properties/replicas": {
         "ui:widget": "range"
+      },
+      "#/properties/imagePullSecrets": {
+        "additionalProperties": {
+          "type": "string"
+        }
       }
     },
     "metaData": {

diff --git a/charts/onechart/tests/deployment_image_test.yaml b/charts/onechart/tests/deployment_image_test.yaml
@@ -16,7 +16,7 @@ tests:
   - it: Should set an ImagePullSecret
     set:
       imagePullSecrets:
-        - name: regcred
+        - regcred
     asserts:
       - template: deployment.yaml
         documentIndex: 0

diff --git a/charts/onechart/values.schema.json b/charts/onechart/values.schema.json
@@ -11,6 +11,7 @@
         "repository": "nginx",
         "tag": "latest"
       },
+      "imagePullSecrets" : [],
       "replicas": 1,
       "nameOverride": "",
       "fullnameOverride": "",
@@ -132,6 +133,22 @@
         ]
       }
     },
+    "imagePullSecrets" : {
+      "$id": "#/properties/imagePullSecrets",
+      "type": "array",
+      "title": "ImagePull Secrets",
+      "description": "The name of the Kubernetes secret to use to pull an image from a private container registry.",
+      "default": [],
+      "examples": [
+        "regcred"
+      ],
+      "additionalItems": true,
+      "items": {
+        "$id": "#/properties/imagePullSecrets/items",
+        "type": "string",
+        "default": ""
+      }
+    },
     "replicas": {
       "$id": "#/properties/replicas",
       "type": "integer",