Merge pull request #37 from foomo/squadron-pull-secrets

fix(squadron): secret mount names
foomo · Oct 30, 2024 · d56851d · d56851d
2 parents b71dc16 + 6c308a5
commit d56851d
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 18 deletions.
diff --git a/charts/squadron-keel-cronjob/Chart.yaml b/charts/squadron-keel-cronjob/Chart.yaml
@@ -15,5 +15,5 @@ annotations:
     - name: Chart Source
       url: https://github.com/foomo/helm-charts
 
-version: 0.1.6
-appVersion: 0.1.6
+version: 0.1.7
+appVersion: 0.1.7
diff --git a/charts/squadron-keel-cronjob/README.md b/charts/squadron-keel-cronjob/README.md
@@ -1,6 +1,6 @@
 # squadron-keel-cronjob
 
-![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.6](https://img.shields.io/badge/AppVersion-0.1.6-informational?style=flat-square)
+![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.7](https://img.shields.io/badge/AppVersion-0.1.7-informational?style=flat-square)
 
 Squadron Keel CronJob Chart
 

diff --git a/charts/squadron-keel-cronjob/templates/cronjob.yaml b/charts/squadron-keel-cronjob/templates/cronjob.yaml
@@ -137,7 +137,7 @@ spec:
                 claimName: {{ include "keel.cronjob.fullname" . }}-data
             {{- end }}
             {{- range $key, $value := .Values.secrets }}
-              - name: {{ $key }}
+              - name: {{ include "keel.cronjob.fullname" $ }}-{{ $key }}
                 secret:
                   secretName: {{ include "keel.cronjob.fullname" $ }}-{{ $key }}
             {{- end }}

diff --git a/charts/squadron-keel-cronjob/values.schema.json b/charts/squadron-keel-cronjob/values.schema.json
@@ -389,8 +389,9 @@
         "pullSecrets": {
           "description": "Image pull secrets",
           "items": {
+            "additionalProperties": true,
             "required": [],
-            "type": "string"
+            "type": "object"
           },
           "required": [],
           "title": "pullSecrets",

diff --git a/charts/squadron-keel-cronjob/values.yaml b/charts/squadron-keel-cronjob/values.yaml
@@ -247,7 +247,8 @@ image:
   # @schema
   # type: array
   # items:
-  #   type: string
+  #   type: object
+  #   additionalProperties: true
   # @schema
   # -- Image pull secrets
   # @section -- Image settings

diff --git a/charts/squadron-keel-server/Chart.yaml b/charts/squadron-keel-server/Chart.yaml
@@ -15,5 +15,5 @@ annotations:
     - name: Chart Source
       url: https://github.com/foomo/helm-charts
 
-version: 0.1.12
-appVersion: 0.1.12
+version: 0.1.13
+appVersion: 0.1.13
diff --git a/charts/squadron-keel-server/README.md b/charts/squadron-keel-server/README.md
@@ -1,6 +1,6 @@
 # squadron-keel-server
 
-![Version: 0.1.12](https://img.shields.io/badge/Version-0.1.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.12](https://img.shields.io/badge/AppVersion-0.1.12-informational?style=flat-square)
+![Version: 0.1.13](https://img.shields.io/badge/Version-0.1.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.13](https://img.shields.io/badge/AppVersion-0.1.13-informational?style=flat-square)
 
 Squadron Keel Server Chart
 

diff --git a/charts/squadron-keel-server/templates/deployment.yaml b/charts/squadron-keel-server/templates/deployment.yaml
@@ -149,7 +149,7 @@ spec:
             claimName: {{ include "keel.server.fullname" . }}-data
         {{- end }}
         {{- range $key, $value := .Values.secrets }}
-        - name: {{ $key }}
+        - name: {{ include "keel.server.fullname" . }}-{{ $key }}
           secret:
             secretName: {{ include "keel.server.fullname" $ }}-{{ $key }}
         {{- end }}

diff --git a/charts/squadron-keel-server/values.schema.json b/charts/squadron-keel-server/values.schema.json
@@ -199,8 +199,9 @@
         "pullSecrets": {
           "description": "Image pull secrets",
           "items": {
+            "additionalProperties": true,
             "required": [],
-            "type": "string"
+            "type": "object"
           },
           "required": [],
           "title": "pullSecrets",

diff --git a/charts/squadron-keel-server/values.yaml b/charts/squadron-keel-server/values.yaml
@@ -262,7 +262,8 @@ image:
   # @schema
   # type: array
   # items:
-  #   type: string
+  #   type: object
+  #   additionalProperties: true
   # @schema
   # -- Image pull secrets
   # @section -- Image settings

diff --git a/charts/squadron-nextjs-server/Chart.yaml b/charts/squadron-nextjs-server/Chart.yaml
@@ -14,5 +14,5 @@ annotations:
     - name: Chart Source
       url: https://github.com/foomo/helm-charts
 
-version: 0.1.6
-appVersion: 0.1.6
+version: 0.1.7
+appVersion: 0.1.7
diff --git a/charts/squadron-nextjs-server/README.md b/charts/squadron-nextjs-server/README.md
@@ -1,6 +1,6 @@
 # squadron-nextjs-server
 
-![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.6](https://img.shields.io/badge/AppVersion-0.1.6-informational?style=flat-square)
+![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.7](https://img.shields.io/badge/AppVersion-0.1.7-informational?style=flat-square)
 
 Squadron NextJS Server Chart
 

diff --git a/charts/squadron-nextjs-server/templates/deployment.yaml b/charts/squadron-nextjs-server/templates/deployment.yaml
@@ -136,7 +136,7 @@ spec:
             claimName: {{ include "nextjs.server.fullname" . }}-data
         {{- end }}
         {{- range $key, $value := .Values.secrets }}
-        - name: {{ $key }}
+        - name: {{ include "nextjs.server.fullname" $ }}-{{ $key }}
           secret:
             secretName: {{ include "nextjs.server.fullname" $ }}-{{ $key }}
         {{- end }}

diff --git a/charts/squadron-nextjs-server/values.schema.json b/charts/squadron-nextjs-server/values.schema.json
@@ -239,8 +239,9 @@
         "pullSecrets": {
           "description": "Image pull secrets",
           "items": {
+            "additionalProperties": true,
             "required": [],
-            "type": "string"
+            "type": "object"
           },
           "required": [],
           "title": "pullSecrets",

diff --git a/charts/squadron-nextjs-server/values.yaml b/charts/squadron-nextjs-server/values.yaml
@@ -253,7 +253,8 @@ image:
   # @schema
   # type: array
   # items:
-  #   type: string
+  #   type: object
+  #   additionalProperties: true
   # @schema
   # -- Image pull secrets
   # @section -- Image settings