DevFW-CICD/argocd-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(argo-cd): Move argocd-cm and argocd-rbac-cm to config section (#1528)

Browse source 
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
This commit is contained in:
Petr Drastil 2022-10-25 19:05:38 +02:00 • committed by GitHub
parent 24de82b214
commit c8f7efb68f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 170 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
View file

@ -1,16 +1,16 @@
{{- if .Values.server.configEnabled }}
{{- if (coalesce .Values.server.configEnabled .Values.configs.cm.create) }}
apiVersion: v1
kind: ConfigMap
metadata:
name: argocd-cm
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "cm") | nindent 4 }}
{{- with .Values.server.configAnnotations }}
{{- with (coalesce .Values.server.configAnnotations .Values.configs.cm.annotations) }}
annotations:
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
data:
{{- include "argo-cd.config" $ | nindent 2 }}
{{- include "argo-cd.config.cm" . | nindent 2 }}
{{- end }}

6
charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml
View file

@ -1,17 +1,17 @@
{{- if .Values.server.rbacConfigCreate }}
{{- if (coalesce .Values.server.rbacConfigCreate .Values.configs.rbac.create) }}
apiVersion: v1
kind: ConfigMap
metadata:
name: argocd-rbac-cm
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "rbac-cm") | nindent 4 }}
{{- with .Values.server.rbacConfigAnnotations }}
{{- with (coalesce .Values.server.rbacConfigAnnotations .Values.configs.rbac.annotations) }}
annotations:
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
{{- with .Values.server.rbacConfig }}
{{- with (coalesce .Values.server.rbacConfig (omit .Values.configs.rbac "create" "annotations")) }}
data:
{{- toYaml . | nindent 2 }}
{{- end }}