diff --git a/deploy/helm/pulse/Chart.yaml b/deploy/helm/pulse/Chart.yaml index 2ff6913..bb63628 100644 --- a/deploy/helm/pulse/Chart.yaml +++ b/deploy/helm/pulse/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pulse description: Helm chart for deploying the Pulse hub and optional Docker monitoring agent. type: application -version: 4.26.0 -appVersion: "4.26.0" +version: 4.26.1 +appVersion: "4.26.1" icon: https://raw.githubusercontent.com/rcourtman/Pulse/main/docs/images/pulse-logo.svg keywords: - monitoring diff --git a/deploy/helm/pulse/templates/deployment.yaml b/deploy/helm/pulse/templates/deployment.yaml index 7e2d2ab..8a1a648 100644 --- a/deploy/helm/pulse/templates/deployment.yaml +++ b/deploy/helm/pulse/templates/deployment.yaml @@ -23,10 +23,14 @@ spec: {{- end }} spec: serviceAccountName: {{ include "pulse.serviceAccountName" . }} - {{- $podSecurityContext := merge (dict) .Values.podSecurityContext .Values.server.podSecurityContext }} + {{- $podSecurityContext := + ternary + (merge (dict) .Values.podSecurityContext .Values.server.podSecurityContext) + .Values.server.podSecurityContext + .Values.podSecurityContext.enabled }} {{- if $podSecurityContext }} securityContext: - {{- toYaml $podSecurityContext | nindent 8 }} + {{- omit $podSecurityContext "enabled" | toYaml | nindent 8 }} {{- end }} {{- with .Values.imagePullSecrets }} imagePullSecrets: @@ -39,10 +43,14 @@ spec: ports: - name: http containerPort: 7655 - {{- $containerSecurityContext := merge (dict) .Values.securityContext .Values.server.securityContext }} + {{- $containerSecurityContext := + ternary + (merge (dict) .Values.containerSecurityContext .Values.server.securityContext) + .Values.server.securityContext + .Values.containerSecurityContext.enabled }} {{- if $containerSecurityContext }} securityContext: - {{- toYaml $containerSecurityContext | nindent 12 }} + {{- omit $containerSecurityContext "enabled" | toYaml | nindent 12 }} {{- end }} {{- $envList := list }} {{- range .Values.server.env }} diff --git a/deploy/helm/pulse/values.yaml b/deploy/helm/pulse/values.yaml index 8a50106..9f62371 100644 --- a/deploy/helm/pulse/values.yaml +++ b/deploy/helm/pulse/values.yaml @@ -22,13 +22,16 @@ serviceAccount: podAnnotations: {} podLabels: {} -podSecurityContext: {} +podSecurityContext: + enabled: true + fsGroup: 1000 -securityContext: +containerSecurityContext: + enabled: true runAsNonRoot: true runAsUser: 1000 runAsGroup: 1000 - fsGroup: 1000 + service: type: ClusterIP