Fix issues with resources and args (#34)

Author: sabre1041

charts/backstage/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # 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.15.2
+version: 0.16.0
 
 dependencies:
   - name: common

charts/backstage/README.md

@@ -1,7 +1,7 @@
 
 # Backstage Helm Chart
 
-![Version: 0.15.2](https://img.shields.io/badge/Version-0.15.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.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
 
@@ -104,6 +104,7 @@ The command removes all the Kubernetes components associated with the chart and
 | backstage.image.repository | Backstage image repository | string | `"backstage/backstage"` |
 | backstage.image.tag | Backstage image tag (immutable tags are recommended) | string | `"latest"` |
 | backstage.initContainers | Backstage container init containers | list | `[]` |
+| backstage.installDir | Directory containing the backstage installation | string | `"/app"` |
 | backstage.podAnnotations | Annotations to add to the backend deployment pods | object | `{}` |
 | backstage.podSecurityContext | Security settings for a Pod.  The security settings that you specify for a Pod apply to all Containers in the Pod. <br /> Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod | object | `{}` |
 | backstage.resources | Resource requests/limits <br /> Ref: https://kubernetes.io/docs/user-guide/compute-resources/ <!-- E.g. resources:   limits:     memory: 1Gi     cpu: 1000m   requests:     memory: 250Mi     cpu: 100m --> | object | `{}` |

charts/backstage/templates/backstage-deployment.yaml

@@ -1,5 +1,6 @@
 {{- $imageRepository := .Values.backstage.image.repository | required "The repository name of the image is required (e.g. my-backstage:tag | docker.io/my-backstage:tag) !" -}}
 {{- $imageTag := .Values.backstage.image.tag | required "The image tag is required (e.g my-backstage:tag | docker.io/my-backstage:tag) !" -}}
+{{- $installDir := .Values.backstage.installDir -}}
 ---
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
@@ -89,12 +90,12 @@ spec:
           {{- if .Values.backstage.extraAppConfig }}
           {{- range .Values.backstage.extraAppConfig }}
             - "--config"
-            - {{ .filename | quote }}
+            - "{{ $installDir }}/{{ .filename }}"
           {{- end }}
           {{- end }}
           {{- if .Values.backstage.appConfig }}
             - "--config"
-            - "app-config-from-configmap.yaml"
+            - "{{ $installDir }}/app-config-from-configmap.yaml"
           {{- end }}
           {{- end }}
           {{- if .Values.backstage.resources }}
@@ -134,12 +135,12 @@ spec:
           volumeMounts:
             {{- range .Values.backstage.extraAppConfig }}
             - name: {{ .configMapRef }}
-              mountPath: "/app/{{ .filename }}"
+              mountPath: "{{ $installDir }}/{{ .filename }}"
               subPath: {{ .filename }}
             {{- end }}
             {{- if .Values.backstage.appConfig }}
             - name: backstage-app-config
-              mountPath: /app/app-config-from-configmap.yaml
+              mountPath: "{{ $installDir }}/app-config-from-configmap.yaml"
               subPath: app-config.yaml
             {{- end }}
             {{- if .Values.backstage.extraVolumeMounts }}

charts/backstage/values.yaml

@@ -135,6 +135,9 @@ backstage:
   # -- Backstage container init containers
   initContainers: []
 
+  # -- Directory containing the backstage installation
+  installDir: /app
+
   # -- Resource requests/limits
   # <br /> Ref: https://kubernetes.io/docs/user-guide/compute-resources/
   # <!-- E.g.