Merge pull request #419 from granular-ryanbonham/fix_helm

Fix helm

production/helm/templates/loki/deployment.yaml

@@ -37,6 +37,8 @@ spec:
       serviceAccountName: {{ template "loki.serviceAccountName" . }}
     {{- if .Values.loki.priorityClassName }}
       priorityClassName: {{ .Values.loki.priorityClassName }}
+      securityContext:
+        {{- toYaml .Values.loki.securityContext | nindent 8 }}
     {{- end }}
       containers:
         - name: {{ .Chart.Name }}
@@ -61,7 +63,7 @@ spec:
           resources:
             {{- toYaml .Values.loki.resources | nindent 12 }}
           securityContext:
-            {{- toYaml .Values.loki.securityContext | nindent 12 }}
+            readOnlyRootFilesystem: true
       nodeSelector:
         {{- toYaml .Values.loki.nodeSelector | nindent 8 }}
       affinity:

production/helm/templates/loki/podsecuritypolicy.yaml

@@ -23,10 +23,7 @@ spec:
   runAsUser:
     rule: 'MustRunAsNonRoot'
   seLinux:
-    rule: 'MustRunAs'
-    ranges:
-    - min: 1
-      max: 65535
+    rule: 'RunAsAny'
   supplementalGroups:
     rule: 'MustRunAs'
     ranges:

production/helm/templates/promtail/daemonset.yaml

@@ -57,10 +57,6 @@ spec:
               name: http-metrics
           securityContext:
             {{- toYaml .Values.promtail.securityContext | nindent 12 }}
-          livenessProbe:
-            {{- toYaml .Values.promtail.livenessProbe | nindent 12 }}
-          readinessProbe:
-            {{- toYaml .Values.promtail.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.promtail.resources | nindent 12 }}
       nodeSelector:

production/helm/values.yaml

@@ -52,7 +52,6 @@ loki:
 
   securityContext:
     fsGroup: 10001
-    readOnlyRootFilesystem: true
     runAsGroup: 10001
     runAsNonRoot: true
     runAsUser: 10001
@@ -159,10 +158,6 @@ promtail:
       mountPath: /var/lib/docker/containers
       readOnly: true
 
-  readinessProbe: null
-
-  livenessProbe: null
-
   resources: {}
   #  limits:
   #    cpu: 200m
@@ -172,7 +167,6 @@ promtail:
   #    memory: 128Mi
 
   securityContext:
-    fsGroup: 0
     readOnlyRootFilesystem: true
     runAsGroup: 0
     runAsUser: 0