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

Merge branch 'master' into feature/issue_templates_chart_name

Browse source
This commit is contained in:
Marco Kilchhofer 2021-09-27 12:05:11 +02:00 committed by GitHub
commit 8d521438e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.1.2 appVersion: 2.1.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: 3.21.0 version: 3.21.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-cd/assets/logo.png icon: https://argoproj.github.io/argo-cd/assets/logo.png
keywords: keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Added]: Ability to provide cluster role to repo-server" - "[Fixed]: Dex deployment now also supports hostAliases"

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

@ -133,10 +133,10 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
serviceAccountName: {{ template "argo-cd.controllerServiceAccountName" . }} serviceAccountName: {{ template "argo-cd.controllerServiceAccountName" . }}
{{- with .Values.global.hostAliases }} {{- with .Values.global.hostAliases }}
hostAliases: hostAliases:
{{ toYaml . | indent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
volumes: volumes:
- emptyDir: {} - emptyDir: {}
name: argocd-home name: argocd-home

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

@ -141,10 +141,10 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
serviceAccountName: {{ template "argo-cd.repoServerServiceAccountName" . }} serviceAccountName: {{ template "argo-cd.repoServerServiceAccountName" . }}
{{- with .Values.global.hostAliases }} {{- with .Values.global.hostAliases }}
hostAliases: hostAliases:
{{ toYaml . | indent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
volumes: volumes:
{{- if .Values.repoServer.volumes }} {{- if .Values.repoServer.volumes }}
{{- toYaml .Values.repoServer.volumes | nindent 6 }} {{- toYaml .Values.repoServer.volumes | nindent 6 }}

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

@ -152,10 +152,10 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
serviceAccountName: {{ template "argo-cd.serverServiceAccountName" . }} serviceAccountName: {{ template "argo-cd.serverServiceAccountName" . }}
{{- with .Values.global.hostAliases }} {{- with .Values.global.hostAliases }}
hostAliases: hostAliases:
{{ toYaml . | indent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
volumes: volumes:
{{- if .Values.server.volumes }} {{- if .Values.server.volumes }}
{{- toYaml .Values.server.volumes | nindent 6}} {{- toYaml .Values.server.volumes | nindent 6}}

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

@ -127,6 +127,10 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
serviceAccountName: {{ template "argo-cd.dexServiceAccountName" . }} serviceAccountName: {{ template "argo-cd.dexServiceAccountName" . }}
{{- with .Values.global.hostAliases }}
hostAliases:
{{- toYaml . | nindent 6 }}
{{- end }}
volumes: volumes:
- emptyDir: {} - emptyDir: {}
name: tmp-dir name: tmp-dir