Add support for external configmaps using backstage.extraEnvVarsCM

Signed-off-by: anessi <anessi@users.noreply.github.com>
backstage · Nov 22, 2023 · 89fb9af · 89fb9af
1 parent 2dab094
commit 89fb9af
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 7 deletions.
diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml
@@ -38,4 +38,4 @@ sources:
 # 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: 1.6.1
+version: 1.7.0
diff --git a/charts/backstage/README.md b/charts/backstage/README.md
@@ -2,7 +2,7 @@
 # Backstage Helm Chart
 
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/backstage)](https://artifacthub.io/packages/search?repo=backstage)
-![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square)
+![Version: 1.7.0](https://img.shields.io/badge/Version-1.7.0-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for deploying a Backstage application
@@ -123,7 +123,8 @@ Kubernetes: `>= 1.19.0-0`
 | backstage.extraAppConfig | Extra app configuration files to inline into command arguments | list | `[]` |
 | backstage.extraContainers | Deployment sidecars | list | `[]` |
 | backstage.extraEnvVars | Backstage container environment variables | list | `[]` |
-| backstage.extraEnvVarsSecrets | Backstage container environment variables from Secrets | list | `[]` |
+| backstage.extraEnvVarsCM | Backstage container environment variables from existing ConfigMaps | list | `[]` |
+| backstage.extraEnvVarsSecrets | Backstage container environment variables from existing Secrets | list | `[]` |
 | backstage.extraVolumeMounts | Backstage container additional volume mounts | list | `[]` |
 | backstage.extraVolumes | Backstage container additional volumes | list | `[]` |
 | backstage.image.debug | Set to true if you would like to see extra information on logs | bool | `false` |

diff --git a/charts/backstage/templates/backstage-deployment.yaml b/charts/backstage/templates/backstage-deployment.yaml
@@ -116,8 +116,12 @@ spec:
           {{- if .Values.backstage.startupProbe }}
           startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backstage.startupProbe "context" $) | nindent 12 }}
           {{- end }}
-          {{- if .Values.backstage.extraEnvVarsSecrets }}
+          {{- if (or .Values.backstage.extraEnvVarsCM .Values.backstage.extraEnvVarsSecrets) }}
           envFrom:
+            {{- range .Values.backstage.extraEnvVarsCM }}
+            - configMapRef:
+                name: {{ . }}
+            {{- end }}
             {{- range .Values.backstage.extraEnvVarsSecrets }}
             - secretRef:
                 name: {{ . }}

diff --git a/charts/backstage/values.schema.json b/charts/backstage/values.schema.json
@@ -1514,6 +1514,20 @@
                     "title": "Backstage container environment variables",
                     "type": "array"
                 },
+                "extraEnvVarsCM": {
+                    "default": [],
+                    "description": "Translates into array of `envFrom.[].configMapRef.name`",
+                    "examples": [
+                        [
+                            "my-backstage-configmap"
+                        ]
+                    ],
+                    "items": {
+                        "type": "string"
+                    },
+                    "title": "Backstage container environment variables from existing ConfigMaps",
+                    "type": "array"
+                },
                 "extraEnvVarsSecrets": {
                     "default": [],
                     "description": "Translates into array of `envFrom.[].secretRef.name`",
@@ -1525,7 +1539,7 @@
                     "items": {
                         "type": "string"
                     },
-                    "title": "Backstage container environment variables from Secrets",
+                    "title": "Backstage container environment variables from existing Secrets",
                     "type": "array"
                 },
                 "extraVolumeMounts": {

diff --git a/charts/backstage/values.schema.tmpl.json b/charts/backstage/values.schema.tmpl.json
@@ -307,8 +307,22 @@
                         ]
                     ]
                 },
+                "extraEnvVarsCM": {
+                    "title": "Backstage container environment variables from existing ConfigMaps",
+                    "type": "array",
+                    "description": "Translates into array of `envFrom.[].configMapRef.name`",
+                    "items": {
+                        "type": "string"
+                    },
+                    "default": [],
+                    "examples": [
+                        [
+                            "my-backstage-configmap"
+                        ]
+                    ]
+                },
                 "extraEnvVarsSecrets": {
-                    "title": "Backstage container environment variables from Secrets",
+                    "title": "Backstage container environment variables from existing Secrets",
                     "type": "array",
                     "description": "Translates into array of `envFrom.[].secretRef.name`",
                     "items": {

diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml
@@ -131,7 +131,10 @@ backstage:
   # -- Backstage container environment variables
   extraEnvVars: []
 
-  # -- Backstage container environment variables from Secrets
+  # -- Backstage container environment variables from existing ConfigMaps
+  extraEnvVarsCM: []
+
+  # -- Backstage container environment variables from existing Secrets
   extraEnvVarsSecrets: []
 
   # -- Backstage container additional volume mounts