simple-app: v0.11.4

epoch8 · Feb 9, 2024 · 2fed5e5 · 2fed5e5
1 parent bca485e
commit 2fed5e5
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 12 deletions.
diff --git a/charts/simple-app/CHANGELOG.md b/charts/simple-app/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.11.4
+
+* Add `.volumes[].secret` and `.volumes[].configMap` options
+
 # 0.11.3
 
 * Add GCP IAP configuation for `GCPBackendPolicy`

diff --git a/charts/simple-app/Chart.yaml b/charts/simple-app/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.11.3"
+version: "0.11.4"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/simple-app/templates/deployment.yaml b/charts/simple-app/templates/deployment.yaml
@@ -41,16 +41,22 @@ spec:
             sizeLimit: {{ .Values.shmSize }}
         {{- end }}
         {{- range .Values.volumes }}
-        - name: {{ $fullName }}-{{ .name }}
+        - name: {{ .name }}
           {{- if .emptyDir }}
           emptyDir:
             sizeLimit: {{ .size }}
-          {{- else }}
+          {{- else if .size }}
           persistentVolumeClaim:
             claimName: {{ $fullName }}-{{ .name }}
+          {{- else if .configMap }}
+          configMap:
+            {{- .configMap | toYaml | nindent 12 }}
+          {{- else if .secret }}
+          secret:
+            {{- .secret | toYaml | nindent 12 }}
           {{- end }}
         {{- end }}
-        {{- if .Values.configs }}
+        {{- range .Values.configs }}
         - name: configs
           configMap:
             name: {{ $fullName }}
@@ -102,7 +108,7 @@ spec:
               mountPath: /dev/shm
             {{- end }}
             {{- range .Values.volumes }}
-            - name: {{ $fullName }}-{{ .name }}
+            - name: {{ .name }}
               mountPath: {{ .mountPath }}
             {{- end }}
             {{- range .Values.configs }}

diff --git a/charts/simple-app/tests/__snapshot__/simple_test.yaml.snap b/charts/simple-app/tests/__snapshot__/simple_test.yaml.snap
@@ -47,11 +47,11 @@ All manifests should match snapshot:
               securityContext: {}
               volumeMounts:
                 - mountPath: /data
-                  name: simple-data
+                  name: data
           securityContext: {}
           serviceAccountName: simple
           volumes:
-            - name: simple-data
+            - name: data
               persistentVolumeClaim:
                 claimName: simple-data
   2: |

diff --git a/charts/simple-app/tests/simple_test.yaml b/charts/simple-app/tests/simple_test.yaml
@@ -231,11 +231,11 @@ tests:
           path: spec.template.spec.containers[0].volumeMounts[0]
           value:
             mountPath: /data
-            name: simple-data
+            name: data
       - equal:
           path: spec.template.spec.volumes[0]
           value:
-            name: simple-data
+            name: data
             persistentVolumeClaim:
               claimName: simple-data
 
@@ -254,14 +254,26 @@ tests:
           path: spec.template.spec.containers[0].volumeMounts[0]
           value:
             mountPath: /data
-            name: simple-data
+            name: data
       - equal:
           path: spec.template.spec.volumes[0]
           value:
-            name: simple-data
+            name: data
             emptyDir:
               sizeLimit: 1Gi
 
+  - it: PVC should not be created if emptyDir
+    template: pvc.yaml
+    set:
+      volumes:
+        - name: data
+          size: 1Gi
+          mountPath: /data
+          emptyDir: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
   - it: PVC should have correctly mounted volumes with pvc
     template: pvc.yaml
     asserts:

diff --git a/charts/simple-app/values.yaml b/charts/simple-app/values.yaml
@@ -53,11 +53,29 @@ command: []
 shmSize: ""
 
 volumes: []
+  # if "size" is set, it will create a PVC
   # - name: data
   #   size: 1Gi
   #   mountPath: /data
-  #   If not need pvc:
+
+  # if "emptyDir" is set, it will create an emptyDir
+  # - name: cache
   #   emptyDir: true
+  #   size: 1Gi
+  #   mountPath: /cache
+
+  # if "secret" is set, it will use the secret
+  # - name: secret
+  #   secret:
+  #     secretName: secret
+  #   mountPath: /secret
+
+  # if "configMap" is set, it will use the configMap
+  # - name: config
+  #   configMap:
+  #     name: config
+  #   mountPath: /config
+
 
 configs: []
   # - name: conn.json