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

Merge branch 'master' into feature/charts/argo/suppport-helm3

Browse source
This commit is contained in:
Clément 2020-12-12 16:34:42 +01:00 committed by GitHub
commit 68473f6992
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
charts/argo/templates/workflow-controller-deployment.yaml
View file

@ -61,6 +61,9 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: metadata.namespace fieldPath: metadata.namespace
{{- with .Values.controller.extraEnv }}
{{ toYaml . | nindent 10 }}
{{- end }}
resources: resources:
{{- toYaml .Values.controller.resources | nindent 12 }} {{- toYaml .Values.controller.resources | nindent 12 }}
{{- if .Values.controller.metricsConfig.enabled }} {{- if .Values.controller.metricsConfig.enabled }}

3
charts/argo/values.yaml
View file

@ -115,6 +115,9 @@ controller:
# service type `LoadBalancer` # service type `LoadBalancer`
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []
resources: {} resources: {}
# The list of environment variable definitions to be added to the controller
# manages container verbatim.
extraEnv: []
replicas: 1 replicas: 1
pdb: pdb:
enabled: false enabled: false