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

MR review

Browse source
This commit is contained in:
Kristof Farkas-Pall 2020-04-30 16:58:33 +01:00
parent d4d435587a
commit 7464b8ff9f
No known key found for this signature in database
GPG key ID: 0C8396E9F0F3C9A3
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
charts/argo/templates/server-deployment.yaml
View file

@ -55,7 +55,10 @@ spec:
- name: IN_CLUSTER - name: IN_CLUSTER
value: "true" value: "true"
- name: ARGO_NAMESPACE - name: ARGO_NAMESPACE
value: {{ .Release.Namespace | quote }} valueFrom:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- name: BASE_HREF - name: BASE_HREF
value: {{ .Values.server.baseHref | quote }} value: {{ .Values.server.baseHref | quote }}
resources: resources:

2
charts/argo/templates/server-sa.yaml
View file

@ -4,5 +4,5 @@ kind: ServiceAccount
metadata: metadata:
name: {{ .Values.server.serviceAccount }} name: {{ .Values.server.serviceAccount }}
annotations: annotations:
{{ toYaml .Values.server.serviceAccountAnnotation | indent 4 }} {{ toYaml .Values.server.serviceAccountAnnotations | indent 4 }}
{{- end -}} {{- end -}}

2
charts/argo/templates/workflow-controller-sa.yaml
View file

@ -3,4 +3,4 @@ kind: ServiceAccount
metadata: metadata:
name: {{ .Values.controller.serviceAccount }} name: {{ .Values.controller.serviceAccount }}
annotations: annotations:
{{ toYaml .Values.controller.serviceAccountAnnotation | indent 4 }} {{ toYaml .Values.controller.serviceAccountAnnotations | indent 4 }}

4
charts/argo/values.yaml
View file

@ -64,7 +64,7 @@ controller:
additionalLabels: {} additionalLabels: {}
serviceAccount: argo serviceAccount: argo
# Service account annotations # Service account annotations
serviceAccountAnnotation: {} serviceAccountAnnotations: {}
name: workflow-controller name: workflow-controller
workflowNamespaces: workflowNamespaces:
- default - default
@ -131,7 +131,7 @@ server:
# servicePortName: http # servicePortName: http
serviceAccount: argo-server serviceAccount: argo-server
# Service account annotations # Service account annotations
serviceAccountAnnotation: {} serviceAccountAnnotations: {}
# Annotations to be applied to the UI Service # Annotations to be applied to the UI Service
serviceAnnotations: {} serviceAnnotations: {}
# Optional labels to add to the UI Service # Optional labels to add to the UI Service