Merge branch 'master' into ocp-clusterrole

This commit is contained in:
John Kost 2020-05-14 22:58:25 -04:00 committed by GitHub
commit c817eb94ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 95 additions and 6 deletions

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:

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

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

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.1
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm
maintainers:

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

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 }}

View file

@ -58,6 +58,7 @@ rules:
- workflows
- workflowtemplates
- cronworkflows
- clusterworkflowtemplates
verbs:
- create
- get

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

View file

@ -55,6 +55,8 @@ rules:
resources:
- workflowtemplates
- workflowtemplates/finalizers
- clusterworkflowtemplates
- clusterworkflowtemplates/finalizers
verbs:
- get
- list

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 }}

View file

@ -111,6 +111,8 @@ executor:
# Overrides .images.tag if defined.
tag: ""
resources: {}
# Adds environment variables for the executor.
env: {}
server:
enabled: true