Merge branch 'master' into privatebin-0.20.2

Author: elrido

charts/privatebin/Chart.yaml

@@ -6,7 +6,7 @@ name: privatebin
 home: https://privatebin.info/
 icon: https://raw.githubusercontent.com/PrivateBin/assets/master/images/preview/icon.png
 type: application
-version: 0.20.2
+version: 0.21.1
 maintainers:
   - name: bdashrad
     email: [email protected]

charts/privatebin/templates/deployment.yaml

@@ -34,10 +34,12 @@ spec:
     spec:
       serviceAccountName: {{ include "privatebin.serviceAccountName" . }}
       automountServiceAccountToken: false
+      {{- if .Values.securityContext }}
       securityContext:
-        runAsUser: {{ .Values.securityContext.runAsUser }}
-        runAsGroup: {{ .Values.securityContext.runAsGroup }}
-        fsGroup: {{ .Values.securityContext.fsGroup }}
+        {{- with .Values.securityContext }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- end }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
       {{- range .Values.image.pullSecrets }}
@@ -52,10 +54,12 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
+          {{- if .Values.podSecurityContext }}
           securityContext:
-            readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }}
-            privileged: false
-            allowPrivilegeEscalation: false
+            {{- with .Values.podSecurityContext }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /

charts/privatebin/values.yaml

@@ -57,7 +57,11 @@ securityContext:
   runAsUser: 65534
   runAsGroup: 82
   fsGroup: 82
+
+podSecurityContext:
   readOnlyRootFilesystem: true
+  privileged: false
+  allowPrivilegeEscalation: false
 
 extraVolumes: []
   # Optionally specify extra list of additional volumes for PrivateBin pod.