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

Merge branch 'fix-persistence-archive-option' of https://github.com/wxmiked/argo-helm into fix-persistence-archive-option

Browse source
This commit is contained in:
Mike Dvorak 2020-06-09 10:46:35 -07:00
commit 5543da5260
6 changed files with 13 additions and 7 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: v1
appVersion: "1.5.4" appVersion: "1.5.4"
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: 2.3.3 version: 2.3.5
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

4
charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml
View file

@ -1,3 +1,4 @@
{{- if .Values.controller.serviceAccount.create }}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
@ -8,4 +9,5 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.controller.name }} app.kubernetes.io/component: {{ .Values.controller.name }}
{{- end }}

4
charts/argo-cd/templates/argocd-server/serviceaccount.yaml
View file

@ -1,3 +1,4 @@
{{- if .Values.server.serviceAccount.create }}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
@ -8,4 +9,5 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
{{- end }}

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

@ -1,4 +1,4 @@
{{- if .Values.dex.enabled }} {{- if .Values.dex.serviceAccount.create }}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
@ -10,4 +10,4 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.dex.name }} app.kubernetes.io/component: {{ .Values.dex.name }}
{{- end }} {{- end }}

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

@ -160,7 +160,7 @@ controller:
# additionalLabels: {} # additionalLabels: {}
## Enable Admin ClusterRole resources. ## Enable Admin ClusterRole resources.
## Enable if you would like to grant rights to ArgoCD to deploy to the local kuberentes cluster. ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster.
clusterAdminAccess: clusterAdminAccess:
enabled: true enabled: true
@ -564,7 +564,7 @@ server:
# roles: [] # roles: []
## Enable Admin ClusterRole resources. ## Enable Admin ClusterRole resources.
## Enable if you would like to grant rights to ArgoCD to deploy to the local kuberentes cluster. ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster.
clusterAdminAccess: clusterAdminAccess:
enabled: true enabled: true

2
charts/argo/values.yaml
View file

@ -39,6 +39,8 @@ controller:
# maxOpenConns: 0 # maxOpenConns: 0
# # save the entire workflow into etcd and DB # # save the entire workflow into etcd and DB
# nodeStatusOffLoad: false # nodeStatusOffLoad: false
# # enable archiving of old workflows
# archive: false
# postgresql: # postgresql:
# host: localhost # host: localhost
# port: 5432 # port: 5432