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

Merge branch 'master' into feat-namespaced-argo-events

Browse source
This commit is contained in:
Marco Kilchhofer 2021-05-29 12:22:26 +02:00 committed by GitHub
commit ab731e4fe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 47 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CODEOWNERS
View file

@ -4,7 +4,7 @@
/charts/ @mkilchhofer
# Argo Workflows
/charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler
/charts/argo-workflows/ @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler
# Argo CD
/charts/argo-cd @seanson @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler

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

@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 2.0.1
appVersion: 2.0.3
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 3.6.1
version: 3.6.3
home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords:

2
charts/argo-cd/templates/argocd-server/certificate.yaml
View file

@ -23,5 +23,5 @@ spec:
issuerRef:
kind: {{ .Values.server.certificate.issuer.kind | quote }}
name: {{ .Values.server.certificate.issuer.name | quote }}
secretName: argocd-secret
secretName: argocd-tls-certificate
{{- end }}

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

@ -11,7 +11,7 @@ installCRDs: true
global:
image:
repository: quay.io/argoproj/argocd
tag: v2.0.1
tag: v2.0.3
imagePullPolicy: IfNotPresent
securityContext: {}
# runAsUser: 999
@ -561,7 +561,7 @@ server:
# servicePort: use-annotation
tls:
[]
# - secretName: argocd-example-tls
# - secretName: argocd-tls-certificate
# hosts:
# - argocd.example.com
https: false
@ -590,7 +590,7 @@ server:
# servicePort: use-annotation
tls:
[]
# - secretName: argocd-example-tls
# - secretName: argocd-tls-certificate
# hosts:
# - argocd.example.com
https: false

7
charts/argo-events/templates/argo-events-sa.yaml
View file

@ -5,7 +5,11 @@ kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccount }}
namespace: {{ .Release.Namespace }}
{{- with .Values.serviceAccountAnnotations }}
annotations: {{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.additionalSaNamespaces }}
{{ $annotations := .Values.serviceAccountAnnotations }}
{{ $sa := .Values.serviceAccount }}
{{- range $namespace := .Values.additionalSaNamespaces }}
---
@ -14,5 +18,8 @@ kind: ServiceAccount
metadata:
name: {{ $sa }}
namespace: {{ $namespace }}
{{- with $annotations }}
annotations: {{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}

1
charts/argo-events/templates/eventbus-controller-deployment.yaml
View file

@ -56,6 +56,7 @@ spec:
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
resources: {{- toYaml .Values.eventbusController.resources | nindent 12 }}
{{- with .Values.eventbusController.priorityClassName }}
priorityClassName: {{ . | quote }}
{{- end }}

1
charts/argo-events/templates/eventsource-controller-deployment.yaml
View file

@ -54,6 +54,7 @@ spec:
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
resources: {{- toYaml .Values.eventsourceController.resources | nindent 12 }}
{{- with .Values.eventsourceController.priorityClassName }}
priorityClassName: {{ . | quote }}
{{- end }}

1
charts/argo-events/templates/sensor-controller-deployment.yaml
View file

@ -54,6 +54,7 @@ spec:
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
resources: {{- toYaml .Values.sensorController.resources | nindent 12 }}
{{- with .Values.sensorController.priorityClassName }}
priorityClassName: {{ . | quote }}
{{- end }}

6
charts/argo-events/values.yaml
View file

@ -14,6 +14,9 @@ installCRD: true
# ServiceAccount to use for running controller.
serviceAccount: argo-events-sa
# serviceAccountAnnotations can be used to enable GKE workload identity, or other use-cases
serviceAccountAnnotations: {}
# Create service accounts in additional namespaces specified
# The SA will always be created in the release namespaces
additionalSaNamespaces: []
@ -54,6 +57,7 @@ sensorController:
priorityClassName: ""
tolerations: []
affinity: {}
resources: {}
eventsourceController:
name: eventsource-controller
@ -67,6 +71,7 @@ eventsourceController:
priorityClassName: ""
tolerations: []
affinity: {}
resources: {}
eventbusController:
name: eventbus-controller
@ -79,6 +84,7 @@ eventbusController:
priorityClassName: ""
tolerations: []
affinity: {}
resources: {}
natsStreamingImage: nats-streaming:0.17.0
natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2

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

@ -2,7 +2,7 @@ apiVersion: v2
name: argo-workflows
description: A Helm chart for Argo Workflows
type: application
version: 0.1.3
version: 0.1.5
appVersion: "v3.0.2"
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm

2
charts/argo-workflows/templates/NOTES.txt
View file

@ -1,6 +1,6 @@
1. Get Argo Server external IP/domain by running:
kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ .Release.Name }}-{{ .Values.server.name }}
kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ template "argo-workflows.server.fullname" . }}
2. Submit the hello-world workflow by running:

4
charts/argo-workflows/templates/_helpers.tpl
View file

@ -65,7 +65,7 @@ Create the name of the server service account to use
*/}}
{{- define "argo-workflows.serverServiceAccountName" -}}
{{- if .Values.server.serviceAccount.create -}}
{{ default (include "argo-workflows.fullname" .) .Values.server.serviceAccount.name }}
{{ default (include "argo-workflows.server.fullname" .) .Values.server.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.server.serviceAccount.name }}
{{- end -}}
@ -76,7 +76,7 @@ Create the name of the controller service account to use
*/}}
{{- define "argo-workflows.controllerServiceAccountName" -}}
{{- if .Values.controller.serviceAccount.create -}}
{{ default (include "argo-workflows.fullname" .) .Values.controller.serviceAccount.name }}
{{ default (include "argo-workflows.controller.fullname" .) .Values.controller.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.controller.serviceAccount.name }}
{{- end -}}

15
charts/argo-workflows/templates/controller/workflow-aggregate-roles.yaml
View file

@ -2,10 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: before-hook-creation
name: argo-workflows-aggregate-to-view
name: {{ template "argo-workflows.fullname" . }}-view
labels:
rbac.authorization.k8s.io/aggregate-to-view: "true"
rules:
@ -30,10 +27,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: before-hook-creation
name: argo-workflows-aggregate-to-edit
name: {{ template "argo-workflows.fullname" . }}-edit
labels:
rbac.authorization.k8s.io/aggregate-to-edit: "true"
rules:
@ -63,10 +57,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: before-hook-creation
name: argo-workflows-aggregate-to-admin
name: {{ template "argo-workflows.fullname" . }}-admin
labels:
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rules:

2
charts/argo-workflows/templates/controller/workflow-controller-cluster-roles.yaml
View file

@ -135,7 +135,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
name: {{ template "argo-workflows.controller.fullname" . }}-cluster-template
rules:
- apiGroups:
- argoproj.io

2
charts/argo-workflows/templates/server/server-deployment.yaml
View file

@ -21,7 +21,7 @@ spec:
{{- end }}
{{- with .Values.server.podAnnotations }}
annotations:
{{- toYaml .Values.server.podAnnotations | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
serviceAccountName: {{ template "argo-workflows.serverServiceAccountName" . }}

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

@ -93,7 +93,7 @@ controller:
additionalLabels: {}
serviceAccount:
create: true
name: argo
name: ""
# Annotations applied to created service account
annotations: {}
name: workflow-controller
@ -190,7 +190,7 @@ server:
# servicePortName: http
serviceAccount:
create: true
name: argo-server
name: ""
annotations: {}
# Annotations to be applied to the UI Service
serviceAnnotations: {}

2
charts/argocd-notifications/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: 1.1.1
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
name: argocd-notifications
type: application
version: 1.3.1
version: 1.3.2
home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords:

4
charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml
View file

@ -5,4 +5,8 @@ metadata:
name: {{ include "argocd-notifications.bots.slack.serviceAccountName" . }}
labels:
{{- include "argocd-notifications.bots.slack.labels" . | nindent 4 }}
{{- with .Values.bots.slack.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{ end }}
{{ end }}

4
charts/argocd-notifications/templates/serviceaccount.yaml
View file

@ -5,4 +5,8 @@ metadata:
name: {{ include "argocd-notifications.serviceAccountName" . }}
labels:
{{- include "argocd-notifications.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}

4
charts/argocd-notifications/values.yaml
View file

@ -93,6 +93,8 @@ serviceAccount:
# If not set and create is true, a name is generated using the fullname template
name: argocd-notifications-controller
annotations: {}
cm:
# Whether helm chart creates controller config map
create: true
@ -371,6 +373,8 @@ bots:
# If not set and create is true, a name is generated using the fullname template
name: argocd-notifications-bot
annotations: {}
resources: {}
# limits:
# cpu: 100m