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

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
Tomas Valasek 2020-05-18 06:50:07 -07:00 committed by GitHub
commit 5355ef1ade
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 165 additions and 37 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"
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 2.3.1
version: 2.3.2
home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords:

19
charts/argo-cd/crds/crd-application.yaml
View file

@ -233,6 +233,9 @@ spec:
description: NameSuffix is a suffix appended to resources
for kustomize apps
type: string
version:
description: Version contains optional Kustomize version
type: string
type: object
path:
description: Path is a directory path within the Git repository
@ -517,6 +520,9 @@ spec:
description: NameSuffix is a suffix appended to resources for
kustomize apps
type: string
version:
description: Version contains optional Kustomize version
type: string
type: object
path:
description: Path is a directory path within the Git repository
@ -776,6 +782,9 @@ spec:
description: NameSuffix is a suffix appended to resources
for kustomize apps
type: string
version:
description: Version contains optional Kustomize version
type: string
type: object
path:
description: Path is a directory path within the Git repository
@ -1049,6 +1058,10 @@ spec:
description: NameSuffix is a suffix appended to
resources for kustomize apps
type: string
version:
description: Version contains optional Kustomize
version
type: string
type: object
path:
description: Path is a directory path within the Git
@ -1335,6 +1348,9 @@ spec:
description: NameSuffix is a suffix appended to resources
for kustomize apps
type: string
version:
description: Version contains optional Kustomize version
type: string
type: object
path:
description: Path is a directory path within the Git repository
@ -1608,6 +1624,9 @@ spec:
description: NameSuffix is a suffix appended to resources
for kustomize apps
type: string
version:
description: Version contains optional Kustomize version
type: string
type: object
path:
description: Path is a directory path within the Git repository

19
charts/argo-cd/crds/crd-project.yaml
View file

@ -95,6 +95,23 @@ spec:
- kind
type: object
type: array
namespaceResourceWhitelist:
description: NamespaceResourceWhitelist contains list of whitelisted
namespace level resources
items:
description: GroupKind specifies a Group and a Kind, but does not
force a version. This is useful for identifying concepts during
lookup stages without having partially valid types
properties:
group:
type: string
kind:
type: string
required:
- group
- kind
type: object
type: array
orphanedResources:
description: OrphanedResources specifies if controller should monitor
orphaned resources of apps in this project
@ -132,6 +149,8 @@ spec:
iat:
format: int64
type: integer
id:
type: string
required:
- iat
type: object

4
charts/argo/Chart.yaml
View file

@ -1,8 +1,8 @@
apiVersion: v1
appVersion: "v2.7.6"
appVersion: v2.8.0
description: A Helm chart for Argo Workflows
name: argo
version: 0.8.6
version: 0.9.2
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm
maintainers:

17
charts/argo/crds/cluster-workflow-template-crd.yaml Normal file
View file

@ -0,0 +1,17 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: clusterworkflowtemplates.argoproj.io
annotations:
helm.sh/hook: crd-install
helm.sh/hook-delete-policy: before-hook-creation
spec:
group: argoproj.io
version: v1alpha1
scope: Cluster
names:
kind: ClusterWorkflowTemplate
plural: clusterworkflowtemplates
shortNames:
- clusterwftmpl
- cwft

19
charts/argo/templates/cluster-workflow-template-crd.yaml Normal file
View file

@ -0,0 +1,19 @@
{{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: clusterworkflowtemplates.argoproj.io
annotations:
helm.sh/hook: crd-install
helm.sh/hook-delete-policy: before-hook-creation
spec:
group: argoproj.io
version: v1alpha1
scope: Cluster
names:
kind: ClusterWorkflowTemplate
plural: clusterworkflowtemplates
shortNames:
- clusterwftmpl
- cwft
{{- end }}

28
charts/argo/templates/server-cluster-role.yaml → charts/argo/templates/server-cluster-roles.yaml
View file

@ -1,14 +1,8 @@
{{- if .Values.server.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: Role
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name }}-role
{{ else }}
kind: ClusterRole
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-role
{{- end }}
name: {{ .Release.Name }}-{{ .Values.server.name }}
rules:
- apiGroups:
- ""
@ -66,4 +60,24 @@ rules:
- update
- patch
- delete
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-template
rules:
- apiGroups:
- argoproj.io
resources:
- clusterworkflowtemplates
verbs:
- get
- list
- watch
{{- if .Values.server.clusterWorkflowTemplates.enableEditing }}
- create
- update
- patch
- delete
{{- end }}
{{- end }}

24
charts/argo/templates/server-crb.yaml
View file

@ -3,21 +3,29 @@ apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: RoleBinding
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name}}-rb
name: {{ .Release.Name }}-{{ .Values.server.name}}
{{ else }}
kind: ClusterRoleBinding
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name}}-crb
name: {{ .Release.Name }}-{{ .Values.server.name}}
{{- end }}
roleRef:
apiGroup: rbac.authorization.k8s.io
{{- if .Values.singleNamespace }}
kind: Role
name: {{ .Release.Name }}-{{ .Values.server.name}}-role
{{ else }}
kind: ClusterRole
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-role
{{- end }}
name: {{ .Release.Name }}-{{ .Values.server.name}}
subjects:
- kind: ServiceAccount
name: {{ .Values.server.serviceAccount }}
namespace: {{ .Release.Namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
subjects:
- kind: ServiceAccount
name: {{ .Values.server.serviceAccount }}

6
charts/argo/templates/workflow-aggregate-roles.yaml
View file

@ -18,6 +18,8 @@ rules:
- workflowtemplates/finalizers
- cronworkflows
- cronworkflows/finalizers
- clusterworkflowtemplates
- clusterworkflowtemplates/finalizers
verbs:
- get
- list
@ -42,6 +44,8 @@ rules:
- workflowtemplates/finalizers
- cronworkflows
- cronworkflows/finalizers
- clusterworkflowtemplates
- clusterworkflowtemplates/finalizers
verbs:
- create
- delete
@ -71,6 +75,8 @@ rules:
- workflowtemplates/finalizers
- cronworkflows
- cronworkflows/finalizers
- clusterworkflowtemplates
- clusterworkflowtemplates/finalizers
verbs:
- create
- delete

27
charts/argo/templates/workflow-controller-clusterrole.yaml → charts/argo/templates/workflow-controller-cluster-roles.yaml
View file

@ -1,13 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: Role
metadata:
name: {{ .Release.Name }}-{{ .Values.controller.name }}-role
{{ else }}
kind: ClusterRole
metadata:
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-role
{{- end }}
name: {{ .Release.Name }}-{{ .Values.controller.name }}
rules:
- apiGroups:
- ""
@ -55,6 +49,8 @@ rules:
resources:
- workflowtemplates
- workflowtemplates/finalizers
- clusterworkflowtemplates
- clusterworkflowtemplates/finalizers
verbs:
- get
- list
@ -101,5 +97,18 @@ rules:
verbs:
- get
{{- end}}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
rules:
- apiGroups:
- argoproj.io
resources:
- clusterworkflowtemplates
- clusterworkflowtemplates/finalizers
verbs:
- get
- list
- watch

10
charts/argo/templates/workflow-controller-config-map.yaml
View file

@ -16,10 +16,14 @@ data:
{{- end }}
{{- end }}
containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }}
{{- with .Values.executor.resources }}
{{- if or .Values.executor.resources .Values.executor.env }}
executor:
resources:
{{- toYaml . | nindent 8 }}
{{- with .Values.executor.resources }}
resources: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.executor.env }}
env: {{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
artifactRepository:
{{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}

22
charts/argo/templates/workflow-controller-crb.yaml
View file

@ -5,16 +5,11 @@ kind: RoleBinding
kind: ClusterRoleBinding
{{- end }}
metadata:
name: {{ .Release.Name }}-{{ .Values.controller.name }}-binding
name: {{ .Release.Name }}-{{ .Values.controller.name }}
roleRef:
apiGroup: rbac.authorization.k8s.io
{{- if .Values.singleNamespace }}
kind: Role
name: {{ .Release.Name }}-{{ .Values.controller.name }}-role
{{ else }}
kind: ClusterRole
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-role
{{- end }}
name: {{ .Release.Name }}-{{ .Values.controller.name }}
subjects:
- kind: ServiceAccount
name: {{ .Values.controller.serviceAccount }}
@ -30,3 +25,16 @@ subjects:
{{- end }}
{{- end }}
{{- end }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
subjects:
- kind: ServiceAccount
name: {{ .Values.controller.serviceAccount }}
namespace: {{ .Release.Namespace }}

5
charts/argo/values.yaml
View file

@ -111,6 +111,8 @@ executor:
# Overrides .images.tag if defined.
tag: ""
resources: {}
# Adds environment variables for the executor.
env: {}
server:
enabled: true
@ -188,6 +190,9 @@ server:
# - secretName: argo-ui-tls
# hosts:
# - argo.domain.com
clusterWorkflowTemplates:
# Give the server permissions to edit ClusterWorkflowTemplates.
enableEditing: true
# Influences the creation of the ConfigMap for the workflow-controller itself.
useDefaultArtifactRepo: false