fix: indent of initContainers (#81)

Signed-off-by: Engin Diri <engin.diri@mail.schwarz>
SchwarzIT · Mar 9, 2022 · 1355a42 · 1355a42
1 parent 2563d64
commit 1355a42
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/charts/node-red/Chart.yaml b/charts/node-red/Chart.yaml
@@ -9,7 +9,7 @@ icon: https://nodered.org/about/resources/media/node-red-icon-2.png
 
 type: application
 
-version: 0.10.0
+version: 0.10.1
 appVersion: 2.2.2
 
 keywords:
@@ -26,11 +26,10 @@ maintainers:
     email: felix.kammerer@mail.schwarz
     url: https://jobs.schwarz
 
-
 annotations:
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/changes: |
-    - adding optional value initContainers
+    - fix indent of initContainers
   artifacthub.io/images: |
     - name: node-red
       image: docker.io/nodered/node-red:2.2.2

diff --git a/charts/node-red/README.md b/charts/node-red/README.md
@@ -1,13 +1,12 @@
 # node-red ⚙
 
-![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=for-the-badge)
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=for-the-badge) 
-![AppVersion: 2.2.2](https://img.shields.io/badge/AppVersion-2.2.2-informational?style=for-the-badge) 
+![Version: 0.10.1](https://img.shields.io/badge/Version-0.10.1-informational?style=for-the-badge)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=for-the-badge)
+![AppVersion: 2.2.2](https://img.shields.io/badge/AppVersion-2.2.2-informational?style=for-the-badge)
 
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/node-red&style=for-the-badge)](https://artifacthub.io/packages/search?repo=node-red)
 [![SIT](https://img.shields.io/badge/SIT-awesome-blueviolet.svg?style=for-the-badge)](https://jobs.schwarz)
 
-
 <img src="https://nodered.org/about/resources/media/node-red-icon-2.png" width="80" height="80">
 
 ## Description
@@ -27,15 +26,15 @@ helm repo update
 To install the chart with the release name node-red run:
 
 ```bash
-helm install node-red node-red/node-red --version 0.10.0
+helm install node-red node-red/node-red --version 0.10.1
 ```
 
 After a few seconds, node-red should be running.
 
 To install the chart in a specific namespace use following commands:
 
 ```bash
-kubectl create ns node-red 
+kubectl create ns node-red
 helm install node-red node-red/node-red --namespace node-red
 ```
 

diff --git a/charts/node-red/templates/deployment.yaml b/charts/node-red/templates/deployment.yaml
@@ -27,28 +27,34 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "node-red.serviceAccountName" . }}
+      {{- if .Values.podSecurityContext }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- if .Values.persistence.enabled }}
+      {{- end }}
+      {{- if or .Values.persistence.enabled .Values.initContainers  }}
       initContainers:
       {{- with .Values.initContainers }}
         {{- toYaml . | nindent 6 }}
       {{- end }}
       {{- if .Values.persistence.enabled }}
-        - name: permission-fix
-          image: busybox
-          command: ['sh', '-c']
-          args: ['chmod -R 777 /data']
-          volumeMounts:
-            - name: data
-              mountPath: /data
-              subPath: {{ .Values.persistence.subPath }}
+      - name: permission-fix
+        image: busybox
+        command: ['sh', '-c']
+        args: ['chmod -R 777 /data']
+        volumeMounts:
+          - name: data
+            mountPath: /data
+            {{- if .Values.persistence.subPath}}
+            subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
       {{- end }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
+          {{- if .Values.securityContext }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+          {{- end }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if .Values.env }}
@@ -81,8 +87,10 @@ spec:
               {{- if .Values.persistence.subPath }}
               subPath: {{ .Values.persistence.subPath }}
               {{- end }}
+          {{- if .Values.resources }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
       volumes:
         {{- with .Values.extraVolumes }}
           {{- toYaml . | nindent 8 }}