Merge pull request #20 from PrivateBin/minor-typos

Clean up some typos and explicitly set Deployment as default
PrivateBin · Mar 11, 2020 · cbdf928 · cbdf928
2 parents f3bfbb6 + 0e2a0cf
commit cbdf928
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/privatebin/Chart.yaml b/privatebin/Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for installing PrivateBin
 name: privatebin
 home: https://privatebin.info/
 icon: https://raw.githubusercontent.com/PrivateBin/assets/master/images/preview/icon.png
-version: 0.4.0
+version: 0.4.1
 maintainers:
   - name: bdashrad
     email: bdashrad@gmail.com

diff --git a/privatebin/templates/deployment.yaml b/privatebin/templates/deployment.yaml
@@ -1,4 +1,6 @@
-{{- if or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both") }}
+---
+{{- $controller := default "Deployment" .Values.controller.kind -}}
+{{- if or (eq $controller "Deployment") (eq $controller "Both") }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/privatebin/templates/ingress.yaml b/privatebin/templates/ingress.yaml
@@ -1,6 +1,6 @@
 ---
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "privatebin.fullname" . -}}
+{{- if .Values.ingress.enabled }}
+{{ $fullName := include "privatebin.fullname" . -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

diff --git a/privatebin/templates/statefulset.yaml b/privatebin/templates/statefulset.yaml
@@ -1,4 +1,6 @@
-{{- if or (eq .Values.controller.kind "StatefulSet") (eq .Values.controller.kind "Both") }}
+---
+{{- $controller := default "Deployment" .Values.controller.kind -}}
+{{- if or (eq $controller "StatefulSet") (eq $controller "Both") }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -59,19 +61,19 @@ spec:
           configMap:
             name: {{ include "privatebin.fullname" . }}-configs
   volumeClaimTemplates:
-  - metadata:
-      name: storage
-    spec:
-      accessModes: [ "ReadWriteMany" ]
-    {{- if .Values.controller.pvc.storageClass }}
-      {{- if (eq "-" .Values.controller.pvc.storageClass) }}
-      storageClassName: ""
-      {{- else }}
-      storageClassName: "{{ .Values.controller.pvc.storageClass }}"
+    - metadata:
+        name: storage
+      spec:
+        accessModes: [ "ReadWriteMany" ]
+      {{- if .Values.controller.pvc.storageClass }}
+        {{- if (eq "-" .Values.controller.pvc.storageClass) }}
+        storageClassName: ""
+        {{- else }}
+        storageClassName: "{{ .Values.controller.pvc.storageClass }}"
+        {{- end }}
       {{- end }}
-    {{- end }}
-      resources:
-        requests:
-          storage: {{ .Values.controller.pvc.requests }}
-      volumeMode: Filesystem
+        resources:
+          requests:
+            storage: {{ .Values.controller.pvc.requests }}
+        volumeMode: Filesystem
 {{- end }}
diff --git a/privatebin/values.yaml b/privatebin/values.yaml
@@ -26,17 +26,17 @@ service:
   # loadBalancerSourceRanges: []
 
 controller:
-  kind: "Deployment"
+  # Valid values are "Deployment", "StatefulSet", and "Both"
+  kind: Deployment
   pvc:
     requests: "1Gi"
-    ## logstash data Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is
     ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
     ##   GKE, AWS & OpenStack)
     ##
-    # storageClass: "-"    
+    # storageClass: "-"
 
 ingress:
   enabled: false