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

Apply suggestions from code review

Browse source 
Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Kilchhofer 2021-09-16 19:27:18 +02:00
parent faa7b7d527
commit 3f325f6541
7 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.1.2
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 3.17.8
version: 3.18.0
home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-cd/assets/logo.png
keywords:

8
charts/argo-cd/templates/argocd-application-controller/deployment.yaml
View file

@ -105,10 +105,10 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
resources:
{{- toYaml .Values.controller.resources | nindent 10 }}
{{- if .Values.controller.extraContainers }}
{{- toYaml .Values.controller.extraContainers | nindent 6 }}
{{- end }}
{{- toYaml .Values.controller.resources | nindent 10 }}
{{- with .Values.controller.extraContainers }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- if .Values.controller.nodeSelector }}
nodeSelector:
{{- toYaml .Values.controller.nodeSelector | nindent 8 }}

8
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -113,10 +113,10 @@ spec:
successThreshold: {{ .Values.repoServer.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.repoServer.readinessProbe.failureThreshold }}
resources:
{{- toYaml .Values.repoServer.resources | nindent 10 }}
{{- if .Values.controller.extraContainers }}
{{- toYaml .Values.controller.extraContainers | nindent 6 }}
{{- end }}
{{- toYaml .Values.repoServer.resources | nindent 10 }}
{{- with .Values.controller.extraContainers }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- if .Values.repoServer.nodeSelector }}
nodeSelector:
{{- toYaml .Values.repoServer.nodeSelector | nindent 8 }}

12
charts/argo-cd/templates/argocd-server/deployment.yaml
View file

@ -120,14 +120,14 @@ spec:
successThreshold: {{ .Values.server.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.server.readinessProbe.failureThreshold }}
resources:
{{- toYaml .Values.server.resources | nindent 10 }}
{{- if .Values.server.lifecycle }}
{{- toYaml .Values.server.resources | nindent 10 }}
{{- if .Values.server.lifecycle }}
lifecycle:
{{- toYaml .Values.server.lifecycle | nindent 10 }}
{{- toYaml .Values.server.lifecycle | nindent 10 }}
{{- end }}
{{- with .Values.server.extraContainers }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- if .Values.server.extraContainers }}
{{- toYaml .Values.server.extraContainers | nindent 6 }}
{{- end }}
{{- if .Values.server.nodeSelector }}
nodeSelector:
{{- toYaml .Values.server.nodeSelector | nindent 8 }}

8
charts/argo-cd/templates/dex/deployment.yaml
View file

@ -99,10 +99,10 @@ spec:
{{- toYaml .Values.dex.volumeMounts | nindent 8 }}
{{- end }}
resources:
{{- toYaml .Values.dex.resources | nindent 10 }}
{{- if .Values.dex.extraContainers }}
{{- toYaml .Values.dex.extraContainers | nindent 6 }}
{{- end }}
{{- toYaml .Values.dex.resources | nindent 10 }}
{{- with .Values.dex.extraContainers }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- if .Values.dex.nodeSelector }}
nodeSelector:
{{- toYaml .Values.dex.nodeSelector | nindent 8 }}

4
charts/argo-cd/templates/redis/deployment.yaml
View file

@ -64,8 +64,8 @@ spec:
{{- end }}
resources:
{{- toYaml .Values.redis.resources | nindent 10 }}
{{- if .Values.redis.extraContainers }}
{{- toYaml .Values.redis.extraContainers | nindent 6 }}
{{- with .Values.redis.extraContainers }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- if .Values.redis.nodeSelector }}
nodeSelector:

11
charts/argo-cd/values.yaml
View file

@ -341,7 +341,7 @@ dex:
# cpu: 10m
# memory: 32Mi
## Additional containers to be added to the controller pod.
## Additional containers to be added to the dex pod.
extraContainers: []
## Redis
@ -424,7 +424,7 @@ redis:
volumeMounts: []
volumes: []
## Additional containers to be added to the controller pod.
## Additional containers to be added to the redis pod.
extraContainers: []
# This key configures Redis-HA subchart and when enabled (redis-ha.enabled=true)
@ -1000,6 +1000,9 @@ repoServer:
## Automount API credentials for the Service Account
automountServiceAccountToken: true
## Additional containers to be added to the repo server pod.
extraContainers: []
## Repo server rbac rules
# rbac:
# - apiGroups:
@ -1218,9 +1221,5 @@ configs:
# background: linear-gradient(to bottom, #999, #777, #333, #222, #111);
# }
## Additional containers to be added to the controller pod.
extraContainers: []
openshift:
enabled: false