Merge pull request #118 from adberger/master

[common]: Make pullSecret configurable
bedag · Oct 27, 2023 · c51a6aa · c51a6aa
2 parents 7327135 + 455a32b
commit c51a6aa
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: common
 description: "Bedag's common Helm chart to use for creating other Helm charts"
-version: 10.7.0
+version: 10.8.0
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives

diff --git a/charts/common/README.md b/charts/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 10.7.0](https://img.shields.io/badge/Version-10.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 10.8.0](https://img.shields.io/badge/Version-10.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Bedag's common Helm chart to use for creating other Helm charts
 

diff --git a/charts/common/templates/_pod.yaml b/charts/common/templates/_pod.yaml
@@ -146,11 +146,15 @@ tolerations:
 {{- if $root.Values.secrets }}
 {{- if $root.Values.secrets.data }}
 {{- if $root.Values.secrets.data.registry }}
-{{- if $root.Values.secrets.data.registry.pullSecret }}
+{{- if $root.Values.secrets.data.registry.pullSecret.enabled }}
 imagePullSecrets:
+{{- if $root.Values.secrets.data.registry.pullSecret.name }}
+  - name: {{ $root.Values.secrets.data.registry.pullSecret.name }}
+{{- else }}
   - name: {{ template "library.name" $root }}-registry-pull-secret
 {{- end }}
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
 {{- end -}}
diff --git a/charts/common/values.schema.json b/charts/common/values.schema.json
@@ -384,7 +384,19 @@
               ],
               "properties": {
                 "pullSecret": {
-                  "type": "boolean"
+                  "type": "object",
+                  "required": [
+                    "enabled"
+                  ],
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean",
+                      "default": false
+                    },
+                    "name": {
+                      "type": "string"
+                    }
+                  }
                 }
               }
             }

diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -16,12 +16,16 @@ defaultTag: latest
 # timezone to set as environment variable 'TZ' in each pod. Comment out for using default ("Europe/Zurich")
 # timezone: "Europe/Zurich"
 
-# secrets contains the pullSecret for the container registry to pull images. Set to 'true' to use a pullSecret.
-# The secret name consists of the 'library.name' variable and the suffix '-registry-pull-secret'.
+# secrets contains the pullSecret for the container registry to pull images. Set 'enabled' to 'true' to use a pullSecret.
+# The secret name consists of the 'library.name' variable and the suffix '-registry-pull-secret' if 'name' is not specified.
 secrets:
   data:
     registry:
-      pullSecret: false
+      pullSecret:
+        # enabled activates the imagePullSecrets in the pod spec
+        enabled: false
+        # name is optional to override the default name, if omitted uses '{{ template "library.name" $root }}-registry-pull-secret'
+        # name: example-foo
 
 # start common.networkpolicy
 # -- networkpolicy restricts all access between the pods. To configure allowed connections, go to components.*.networkpolicy.podSelector