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

[charts/argo-cd] Update to 1.3, some chart cleanup (#165)

Browse source 
* [charts/argo-cd] Update to 1.3, some chart cleanup
* Bumps the version of ArgoCD to 1.3 and the chart version to 1.2 due
to a CRD change. Restored conditional CRDs to correct #27. Additionally,
 some value defaults were added so Helm strict linting could pass.
* This adds some examples to the values.yaml on how to use the new
Helm repo chart types. Add helmignore to help with development.
This commit is contained in:
Sean Johnson 2019-11-21 15:40:15 +11:00 • committed by GitHub
parent 8c3430b89e
commit 1e2038adca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 181 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,4 @@
{{- if .Values.installCRDs }}
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
@ -416,7 +417,7 @@ spec:
type: object
type: array
revision:
description: Revision is the git revision in which to sync the application
description: Revision is the revision in which to sync the application
to. If omitted, will use the revision specified in app spec.
type: string
source:
@ -424,6 +425,9 @@ spec:
This is typically set in a Rollback operation and nil during a
Sync operation
properties:
chart:
description: Chart is a Helm chart name
type: string
directory:
description: Directory holds path/directory specific options
properties:
@ -492,6 +496,10 @@ spec:
items:
type: string
type: array
values:
description: Values is Helm values, typically defined as
a block
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
@ -536,8 +544,7 @@ spec:
type: string
type: object
path:
description: Path is a directory path within the repository
containing a
description: Path is a directory path within the Git repository
type: string
plugin:
description: ConfigManagementPlugin holds config management
@ -561,7 +568,7 @@ spec:
type: string
type: object
repoURL:
description: RepoURL is the git repository URL of the application
description: RepoURL is the repository URL of the application
manifests
type: string
targetRevision:
@ -571,7 +578,6 @@ spec:
type: string
required:
- repoURL
- path
type: object
syncStrategy:
description: SyncStrategy describes how to perform the sync
@ -634,7 +640,6 @@ spec:
namespace:
type: string
required:
- group
- kind
- jsonPointers
type: object
@ -661,6 +666,9 @@ spec:
description: Source is a reference to the location ksonnet application
definition
properties:
chart:
description: Chart is a Helm chart name
type: string
directory:
description: Directory holds path/directory specific options
properties:
@ -729,6 +737,9 @@ spec:
items:
type: string
type: array
values:
description: Values is Helm values, typically defined as a block
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
@ -773,8 +784,7 @@ spec:
type: string
type: object
path:
description: Path is a directory path within the repository containing
a
description: Path is a directory path within the Git repository
type: string
plugin:
description: ConfigManagementPlugin holds config management plugin
@ -798,8 +808,7 @@ spec:
type: string
type: object
repoURL:
description: RepoURL is the git repository URL of the application
manifests
description: RepoURL is the repository URL of the application manifests
type: string
targetRevision:
description: TargetRevision defines the commit, tag, or branch in
@ -807,7 +816,6 @@ spec:
type: string
required:
- repoURL
- path
type: object
syncPolicy:
description: SyncPolicy controls when a sync will be performed
@ -867,6 +875,9 @@ spec:
type: string
source:
properties:
chart:
description: Chart is a Helm chart name
type: string
directory:
description: Directory holds path/directory specific options
properties:
@ -936,6 +947,10 @@ spec:
items:
type: string
type: array
values:
description: Values is Helm values, typically defined
as a block
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
@ -980,8 +995,7 @@ spec:
type: string
type: object
path:
description: Path is a directory path within the repository
containing a
description: Path is a directory path within the Git repository
type: string
plugin:
description: ConfigManagementPlugin holds config management
@ -1005,7 +1019,7 @@ spec:
type: string
type: object
repoURL:
description: RepoURL is the git repository URL of the application
description: RepoURL is the repository URL of the application
manifests
type: string
targetRevision:
@ -1015,7 +1029,6 @@ spec:
type: string
required:
- repoURL
- path
type: object
required:
- revision
@ -1024,6 +1037,8 @@ spec:
type: object
type: array
observedAt:
description: ObservedAt indicates when the application state was updated
without querying latest git state
format: date-time
type: string
operationState:
@ -1071,15 +1086,18 @@ spec:
type: object
type: array
revision:
description: Revision is the git revision in which to sync
the application to. If omitted, will use the revision
specified in app spec.
description: Revision is the revision in which to sync the
application to. If omitted, will use the revision specified
in app spec.
type: string
source:
description: Source overrides the source definition set
in the application. This is typically set in a Rollback
operation and nil during a Sync operation
properties:
chart:
description: Chart is a Helm chart name
type: string
directory:
description: Directory holds path/directory specific
options
@ -1155,6 +1173,10 @@ spec:
items:
type: string
type: array
values:
description: Values is Helm values, typically defined
as a block
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
@ -1200,8 +1222,8 @@ spec:
type: string
type: object
path:
description: Path is a directory path within the repository
containing a
description: Path is a directory path within the Git
repository
type: string
plugin:
description: ConfigManagementPlugin holds config management
@ -1225,8 +1247,8 @@ spec:
type: string
type: object
repoURL:
description: RepoURL is the git repository URL of the
application manifests
description: RepoURL is the repository URL of the application
manifests
type: string
targetRevision:
description: TargetRevision defines the commit, tag,
@ -1235,7 +1257,6 @@ spec:
type: string
required:
- repoURL
- path
type: object
syncStrategy:
description: SyncStrategy describes how to perform the sync
@ -1322,12 +1343,15 @@ spec:
type: object
type: array
revision:
description: Revision holds the git commit SHA of the sync
description: Revision holds the revision of the sync
type: string
source:
description: Source records the application source information
of the sync, used for comparing auto-sync
properties:
chart:
description: Chart is a Helm chart name
type: string
directory:
description: Directory holds path/directory specific options
properties:
@ -1399,6 +1423,10 @@ spec:
items:
type: string
type: array
values:
description: Values is Helm values, typically defined
as a block
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
@ -1444,8 +1472,7 @@ spec:
type: string
type: object
path:
description: Path is a directory path within the repository
containing a
description: Path is a directory path within the Git repository
type: string
plugin:
description: ConfigManagementPlugin holds config management
@ -1469,7 +1496,7 @@ spec:
type: string
type: object
repoURL:
description: RepoURL is the git repository URL of the application
description: RepoURL is the repository URL of the application
manifests
type: string
targetRevision:
@ -1479,7 +1506,6 @@ spec:
type: string
required:
- repoURL
- path
type: object
required:
- revision
@ -1490,6 +1516,8 @@ spec:
- startedAt
type: object
reconciledAt:
description: ReconciledAt indicates when the application state was reconciled
using the latest git version
format: date-time
type: string
resources:
@ -1553,6 +1581,9 @@ spec:
type: object
source:
properties:
chart:
description: Chart is a Helm chart name
type: string
directory:
description: Directory holds path/directory specific options
properties:
@ -1624,6 +1655,10 @@ spec:
items:
type: string
type: array
values:
description: Values is Helm values, typically defined
as a block
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
@ -1669,8 +1704,7 @@ spec:
type: string
type: object
path:
description: Path is a directory path within the repository
containing a
description: Path is a directory path within the Git repository
type: string
plugin:
description: ConfigManagementPlugin holds config management
@ -1694,7 +1728,7 @@ spec:
type: string
type: object
repoURL:
description: RepoURL is the git repository URL of the application
description: RepoURL is the repository URL of the application
manifests
type: string
targetRevision:
@ -1704,7 +1738,6 @@ spec:
type: string
required:
- repoURL
- path
type: object
required:
- source
@ -1726,3 +1759,4 @@ spec:
- name: v1alpha1
served: true
storage: true
{{- end }}

55
charts/argo-cd/templates/crds/appproject-crd.yaml
View file

@ -1,3 +1,4 @@
{{- if .Values.installCRDs }}
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
@ -434,6 +435,15 @@ spec:
- kind
type: object
type: array
orphanedResources:
description: OrphanedResources specifies if controller should monitor
orphaned resources of apps in this project
properties:
warn:
description: Warn indicates if warning condition should be created
for apps which have orphaned resources
type: boolean
type: object
roles:
description: Roles are user defined RBAC roles associated with this
project
@ -477,11 +487,51 @@ spec:
type: object
type: array
sourceRepos:
description: SourceRepos contains list of git repository URLs which
can be used for deployment
description: SourceRepos contains list of repository URLs which can
be used for deployment
items:
type: string
type: array
syncWindows:
description: SyncWindows controls when syncs can be run for apps in
this project
items:
properties:
applications:
description: Applications contains a list of applications that
the window will apply to
items:
type: string
type: array
clusters:
description: Clusters contains a list of clusters that the window
will apply to
items:
type: string
type: array
duration:
description: Duration is the amount of time the sync window will
be open
type: string
kind:
description: Kind defines if the window allows or blocks syncs
type: string
manualSync:
description: ManualSync enables manual syncs when they would otherwise
be blocked
type: boolean
namespaces:
description: Namespaces contains a list of namespaces that the
window will apply to
items:
type: string
type: array
schedule:
description: Schedule is the time the window will begin, specified
in cron format
type: string
type: object
type: array
type: object
required:
- metadata
@ -491,3 +541,4 @@ spec:
- name: v1alpha1
served: true
storage: true
{{- end }}

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

@ -28,7 +28,7 @@ spec:
initContainers:
- name: copyutil
image: {{ default .Values.global.image.repository .Values.dex.initImage.repository }}:{{ default .Values.global.image.tag .Values.dex.initImage.tag }}
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.dex.initImage.pullPolicy }}
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.dex.initImage.imagePullPolicy }}
command:
- cp
- /usr/local/bin/argocd-util
@ -73,4 +73,4 @@ spec:
volumes:
{{- toYaml .Values.dex.volumes | nindent 8}}
{{- end }}
{{- end }}
{{- end }}