feat: use globalsecuritycontext for dex too, trim whitespace (#248)

Signed-off-by: David Karlsen <david@davidkarlsen.com>
This commit is contained in:
David J. M. Karlsen 2020-02-22 03:14:00 +01:00 committed by GitHub
parent d9d7862864
commit 7ba77fde18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions

View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "1.4.2" appVersion: "1.4.2"
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 1.8.0 version: 1.8.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

View file

@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.dex.name }} app.kubernetes.io/component: {{ .Values.dex.name }}
app.kubernetes.io/version: {{ .Values.dex.image.tag }} app.kubernetes.io/version: {{ .Values.dex.image.tag }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -25,17 +25,20 @@ spec:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.dex.name }} app.kubernetes.io/component: {{ .Values.dex.name }}
app.kubernetes.io/version: {{ .Values.dex.image.tag }} app.kubernetes.io/version: {{ .Values.dex.image.tag }}
spec: spec:
{{- if .Values.global.securityContext }}
securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
{{- end }}
initContainers: initContainers:
- name: copyutil - name: copyutil
image: {{ default .Values.global.image.repository .Values.dex.initImage.repository }}:{{ default .Values.global.image.tag .Values.dex.initImage.tag }} image: {{ default .Values.global.image.repository .Values.dex.initImage.repository }}:{{ default .Values.global.image.tag .Values.dex.initImage.tag }}
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.dex.initImage.imagePullPolicy }} imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.dex.initImage.imagePullPolicy }}
resources: resources:
{{- toYaml .Values.dex.resources | nindent 10 }} {{- toYaml .Values.dex.resources | nindent 10 }}
{{- if .Values.dex.containerSecurityContext }} {{- if .Values.dex.containerSecurityContext }}
securityContext: {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }} securityContext: {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }}
{{- end }} {{- end }}
command: command:
- cp - cp
- /usr/local/bin/argocd-util - /usr/local/bin/argocd-util
@ -52,7 +55,7 @@ spec:
- rundex - rundex
{{- if .Values.dex.containerSecurityContext }} {{- if .Values.dex.containerSecurityContext }}
securityContext: {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }} securityContext: {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }}
{{- end }} {{- end }}
{{- if .Values.dex.env }} {{- if .Values.dex.env }}
env: env:
{{- toYaml .Values.dex.env | nindent 8 }} {{- toYaml .Values.dex.env | nindent 8 }}