From 8f7d9ff0d8e9a2afcbfc20407f857d95df1afcc9 Mon Sep 17 00:00:00 2001 From: Spencer Gilbert Date: Thu, 22 Apr 2021 11:50:04 -0400 Subject: [PATCH 01/19] Update CODEOWNERS (#691) Unfortunately I haven't had the time to participate here for a while, and seem to be moving away from using ArgoCD so I think it'd be appropriate to remove me from here. Signed-off-by: Spencer Gilbert --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index f35c9b71..bb890183 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -4,7 +4,7 @@ /charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler # Argo CD -/charts/argo-cd @seanson @spencergilbert @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler +/charts/argo-cd @seanson @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler # Argo Events /charts/argo-events @jbehling @VaibhavPage @oliverbaehler From 7e5a2e136f537a7af0080dd408ae9477f80923bf Mon Sep 17 00:00:00 2001 From: AIKAWA Date: Sat, 24 Apr 2021 00:36:55 +0900 Subject: [PATCH 02/19] chore(argo): fix referenced URL (#693) * fix referenced URL Signed-off-by: yu-croco * update chart version due to referenced link fix Signed-off-by: yu-croco --- charts/argo/Chart.yaml | 2 +- charts/argo/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 1ce323cc..741fa2e6 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.12.5 description: A Helm chart for Argo Workflows name: argo -version: 0.16.8 +version: 0.16.9 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 0a5be36d..31a36041 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -136,7 +136,7 @@ controller: # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ # PriorityClass: system-cluster-critical priorityClassName: "" - # https://argoproj.github.io/argo/links/ + # https://argoproj.github.io/argo-workflows/links/ links: [] # executor controls how the init and wait container should be customized @@ -206,7 +206,7 @@ server: # Run the argo server in "secure" mode. Configure this value instead of # "--secure" in extraArgs. See the following documentation for more details # on secure mode: - # https://argoproj.github.io/argo/tls/#encrypted + # https://argoproj.github.io/argo-workflows/tls/#encrypted secure: false # Extra arguments to provide to the Argo server binary. From bb9af68fc2cc7d1f846855e19d00c8659a8a7c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20B=C3=A4hler?= Date: Fri, 23 Apr 2021 21:54:05 +0200 Subject: [PATCH 03/19] feat(argo-ci): deprecate argo-ci helm chart (#688) Co-authored-by: Alex Collins --- charts/argo-ci/Chart.yaml | 13 +++++++------ charts/argo-ci/README.md | 2 ++ charts/argo-ci/requirements.lock | 6 ------ charts/argo-ci/requirements.yaml | 4 ---- 4 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 charts/argo-ci/requirements.lock delete mode 100644 charts/argo-ci/requirements.yaml diff --git a/charts/argo-ci/Chart.yaml b/charts/argo-ci/Chart.yaml index b658915d..c41334d9 100644 --- a/charts/argo-ci/Chart.yaml +++ b/charts/argo-ci/Chart.yaml @@ -1,11 +1,12 @@ -apiVersion: v1 +apiVersion: v2 description: A Helm chart for Argo-CI name: argo-ci -version: 0.1.7 +version: 1.0.0 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png appVersion: v1.0.0-alpha2 home: https://github.com/argoproj/argo-helm -maintainers: - - name: alexec - - name: alexmt - - name: jessesuen +deprecated: true +dependencies: + - name: argo + version: "^0.16.0" + repository: https://argoproj.github.io/argo-helm diff --git a/charts/argo-ci/README.md b/charts/argo-ci/README.md index 28231e8c..7eaa9039 100644 --- a/charts/argo-ci/README.md +++ b/charts/argo-ci/README.md @@ -1,3 +1,5 @@ # Argo CI Chart +**Deprecated** - Use [Argo-Events](./argo-events) instead. + This is a **community maintained** chart. diff --git a/charts/argo-ci/requirements.lock b/charts/argo-ci/requirements.lock deleted file mode 100644 index 14b83c58..00000000 --- a/charts/argo-ci/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: argo - repository: https://argoproj.github.io/argo-helm - version: 0.2.1 -digest: sha256:af0f837200061b1720c0e05168dfc4a9537582f3004de62eeb5ef01b4c78db64 -generated: 2018-10-23T14:50:47.570677461-07:00 diff --git a/charts/argo-ci/requirements.yaml b/charts/argo-ci/requirements.yaml deleted file mode 100644 index e9370ec3..00000000 --- a/charts/argo-ci/requirements.yaml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: -- name: argo - version: 0.2.1 - repository: https://argoproj.github.io/argo-helm From 7b78693819dcea0d34097865df71b3978b12b712 Mon Sep 17 00:00:00 2001 From: kostas-theo <43744618+kostas-theo@users.noreply.github.com> Date: Fri, 23 Apr 2021 23:00:23 +0200 Subject: [PATCH 04/19] fix: add missing status resources in rbac clusterrole (#694) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kostas-theo Co-authored-by: Oliver Bähler --- charts/argo-events/Chart.yaml | 2 +- charts/argo-events/templates/argo-events-cluster-roles.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index a7a9854e..1f138c3c 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 1.3.1 +version: 1.3.2 keywords: - argo-events - sensor-controller diff --git a/charts/argo-events/templates/argo-events-cluster-roles.yaml b/charts/argo-events/templates/argo-events-cluster-roles.yaml index 16f55e46..bfd2d021 100644 --- a/charts/argo-events/templates/argo-events-cluster-roles.yaml +++ b/charts/argo-events/templates/argo-events-cluster-roles.yaml @@ -47,10 +47,13 @@ rules: - workflowtemplates/finalizers - sensors - sensors/finalizers + - sensors/status - eventsources - eventsources/finalizers + - eventsources/status - eventbus - eventbus/finalizers + - eventbus/status - apiGroups: - "" resources: From 71cbdbb811655b2a8ed1b7f8f36347061052ce1c Mon Sep 17 00:00:00 2001 From: Mike Sarver Date: Fri, 23 Apr 2021 17:14:52 -0600 Subject: [PATCH 05/19] feat(argo-cd): Add label to cluster-secrets for usage with appSet cluster selector (#692) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add cluster label for use with appSet cluster selector Signed-off-by: mike sarver * feat(argo-cd): Add label to cluster-secrets for usage with appSet cluster selector Signed-off-by: mike sarver * feat(argo-cd): use with for adding labels Signed-off-by: mike sarver Co-authored-by: Oliver Bähler --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml | 3 +++ charts/argo-cd/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index ed2d87be..72994ece 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.0 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.2.0 +version: 3.2.1 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml index a4190768..4fb7e883 100644 --- a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml +++ b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml @@ -6,6 +6,9 @@ metadata: name: {{ include "argo-cd.name" $ }}-cluster-{{ .name }} labels: {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }} + {{- with .labels }} + {{- toYaml . | nindent 4 }} + {{- end }} argocd.argoproj.io/secret-type: cluster {{- with .annotations }} annotations: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 32e244ab..adc358f7 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -881,6 +881,7 @@ configs: clusterCredentials: [] # - name: mycluster # server: https://mycluster.com + # labels: {} # annotations: {} # config: # bearerToken: "" @@ -889,6 +890,7 @@ configs: # caData: "" # - name: mycluster2 # server: https://mycluster2.com + # labels: {} # annotations: {} # namespaces: namespace1,namespace2 # config: From 3ba4cdb1ca9bf1c7bdc561b2255886ff4cb17949 Mon Sep 17 00:00:00 2001 From: Marcel Hoyer Date: Sat, 24 Apr 2021 12:50:25 +0200 Subject: [PATCH 06/19] fix(argo-cd): Sync ArgoCD helm chart with kustomize (#659) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * copy CRD resource files from https://github.com/argoproj/argo-cd/tree/v2.0.0/manifests/crds Signed-off-by: Marcel Hoyer * update `global.image` values in `values.yaml` to quay.io Signed-off-by: Marcel Hoyer * update redis image to 6.2.1 Signed-off-by: Marcel Hoyer * add optional volume mount to secret `argocd-repo-server-tls` according to https://github.com/argoproj/argo-cd/commit/7a68880e2ea825afb0076637b51b1e9b26a9c8f0 Signed-off-by: Marcel Hoyer * increase patch version of chart to 3.0.1 Signed-off-by: Marcel Hoyer * add `redis.extraArgs` to enable customization of `redis-server` arguments Signed-off-by: Marcel Hoyer * add some notes to the `README` about syncing changes from original `manifests/install.yaml` Signed-off-by: Marcel Hoyer * fix example for `extraArgs` in `values.yaml` of argo-cd chart Signed-off-by: Marcel Hoyer * Bump chart version to 3.1.2 Signed-off-by: Marcel Hoyer * Bump argo-cd version to 3.2.2 Signed-off-by: Marcel Hoyer Co-authored-by: Oliver Bähler Co-authored-by: Oliver Bähler --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 25 +- charts/argo-cd/crds/crd-application.yaml | 506 ++++++++++-------- charts/argo-cd/crds/crd-project.yaml | 33 +- .../deployment.yaml | 17 +- .../argocd-repo-server/deployment.yaml | 13 + .../templates/argocd-server/deployment.yaml | 13 + .../argo-cd/templates/redis/deployment.yaml | 5 +- charts/argo-cd/values.yaml | 24 +- 9 files changed, 386 insertions(+), 252 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 72994ece..766578ef 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.0 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.2.1 +version: 3.2.2 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 6d1430d1..7716e41e 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -12,6 +12,26 @@ The default installation is intended to be similar to the provided ArgoCD [relea This chart currently installs the non-HA version of ArgoCD. +### Synchronizing Changes from Original Repository + +In the original [ArgoCD repository](https://github.com/argoproj/argo-cd/) an [`manifests/install.yaml`](https://github.com/argoproj/argo-cd/blob/master/manifests/install.yaml) is generated using `kustomize`. It's the basis for the installation as [described in the docs](https://argo-cd.readthedocs.io/en/stable/getting_started/#1-install-argo-cd). + +When installing ArgoCD using this helm chart the user should have a similar experience and configuration rolled out. Hence, it makes sense to try to achieve a similar output of rendered `.yaml` resources when calling `helm template` using the default settings in `values.yaml`. + +To update the templates and default settings in `values.yaml` it may come in handy to look up the diff of the `manifests/install.yaml` between two versions accordingly. This can either be done directly via github and look for `manifests/install.yaml`: + +https://github.com/argoproj/argo-cd/compare/v1.8.7...v2.0.0#files_bucket + +Or you clone the repository and do a local `git-diff`: + +```bash +git clone https://github.com/argoproj/argo-cd.git +cd argo-cd +git diff v1.8.7 v2.0.0 -- manifests/install.yaml +``` + +Changes in the `CustomResourceDefinition` resources shall be fixed easily by copying 1:1 from the [`manifests/crds` folder](https://github.com/argoproj/argo-cd/tree/master/manifests/crds) into this [`charts/argo-cd/crds` folder](https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd/crds). + ## Upgrading ### 3.0.0 and above @@ -334,7 +354,8 @@ through `xxx.extraArgs` | redis.enabled | Enable redis | `true` | | redis.image.imagePullPolicy | Redis imagePullPolicy | `"IfNotPresent"` | | redis.image.repository | Redis repository | `"redis"` | -| redis.image.tag | Redis tag | `"5.0.8"` | +| redis.image.tag | Redis tag | `"6.2.1-alpine"` | +| redis.extraArgs | Additional arguments for the `redis-server`. A list of flags. | `[]` | | redis.name | Redis name | `"redis"` | | redis.env | Environment variables for the Redis server. | `[]` | | redis.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` | @@ -354,6 +375,6 @@ through `xxx.extraArgs` | redis-ha.redis.config.save | Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled | `""` | | redis-ha.haproxy.enabled | Enabled HAProxy LoadBalancing/Proxy | `true` | | redis-ha.haproxy.metrics.enabled | HAProxy enable prometheus metric scraping | `true` | -| redis-ha.image.tag | Redis tag | `"5.0.8-alpine"` | +| redis-ha.image.tag | Redis tag | `"6.2.1-alpine"` | [gRPC-ingress]: https://argoproj.github.io/argo-cd/operator-manual/ingress/ diff --git a/charts/argo-cd/crds/crd-application.yaml b/charts/argo-cd/crds/crd-application.yaml index cd4678fa..c62189e8 100644 --- a/charts/argo-cd/crds/crd-application.yaml +++ b/charts/argo-cd/crds/crd-application.yaml @@ -19,10 +19,7 @@ spec: singular: application scope: Namespaced versions: - - name: v1alpha1 - served: true - storage: true - additionalPrinterColumns: + - additionalPrinterColumns: - jsonPath: .status.sync.status name: Sync Status type: string @@ -33,7 +30,7 @@ spec: name: Revision priority: 10 type: string - subresources: {} + name: v1alpha1 schema: openAPIV3Schema: description: Application is a definition of Application resource. @@ -47,9 +44,10 @@ spec: metadata: type: object operation: - description: Operation contains requested operation parameters. + description: Operation contains information about a requested or running operation properties: info: + description: Info is a list of informational items for this operation items: properties: name: @@ -62,20 +60,20 @@ spec: type: object type: array initiatedBy: - description: OperationInitiator holds information about the operation initiator + description: InitiatedBy contains information about who initiated the operations properties: automated: description: Automated is set to true if operation was initiated automatically by the application controller. type: boolean username: - description: Name of a user who started operation. + description: Username contains the name of a user who started operation type: string type: object retry: - description: Retry controls failed sync retry behavior + description: Retry controls the strategy to apply if a sync fails properties: backoff: - description: Backoff is a backoff strategy + description: Backoff controls how to backoff on subsequent retries of failed syncs properties: duration: description: Duration is the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h") @@ -89,15 +87,15 @@ spec: type: string type: object limit: - description: Limit is the maximum number of attempts when retrying a container + description: Limit is the maximum number of attempts for retrying a failed sync. If set to 0, no retries will be performed. format: int64 type: integer type: object sync: - description: SyncOperation contains sync operation details. + description: Sync contains parameters for the operation properties: dryRun: - description: DryRun will perform a `kubectl apply --dry-run` without actually performing the sync + description: DryRun specifies to perform a `kubectl apply --dry-run` without actually performing the sync type: boolean manifests: description: Manifests is an optional field that overrides sync source with a local directory for development @@ -105,10 +103,10 @@ spec: type: string type: array prune: - description: Prune deletes resources that are no longer tracked in git + description: Prune specifies to delete resources from the cluster that are no longer tracked in git type: boolean resources: - description: Resources describes which resources to sync + description: Resources describes which resources shall be part of the sync items: description: SyncOperationResource contains resources to sync. properties: @@ -126,26 +124,30 @@ spec: type: object type: array revision: - description: Revision is the revision in which to sync the application to. If omitted, will use the revision specified in app spec. + description: Revision is the revision (Git) or chart version (Helm) 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 + description: Source overrides the source definition set in the application. This is typically set in a Rollback operation and is nil during a Sync operation properties: chart: - description: Chart is a Helm chart name + description: Chart is a Helm chart name, and must be specified for applications sourced from a Helm repo. type: string directory: description: Directory holds path/directory specific options properties: exclude: + description: Exclude contains a glob pattern to match paths against that should be explicitly excluded from being used during manifest generation + type: string + include: + description: Include contains a glob pattern to match paths against that should be explicitly included during manifest generation type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific options + description: Jsonnet holds options specific to Jsonnet properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -166,7 +168,7 @@ spec: tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -181,6 +183,7 @@ spec: type: array type: object recurse: + description: Recurse specifies whether to scan a directory recursively for manifests type: boolean type: object helm: @@ -189,34 +192,34 @@ spec: fileParameters: description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to a helm template + description: HelmFileParameter is a file parameter that's passed to helm template during manifest generation properties: name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string path: - description: Path is the path value for the helm parameter + description: Path is the path to the file containing the values for the Helm parameter type: string type: object type: array parameters: - description: Parameters are parameters to the helm template + description: Parameters is a list of Helm parameters which are passed to the helm template command upon manifest generation items: - description: HelmParameter is a parameter to a helm template + description: HelmParameter is a parameter that's passed to helm template during manifest generation properties: forceString: description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string value: - description: Value is the value for the helm parameter + description: Value is the value for the Helm parameter type: string type: object type: array releaseName: - description: The Helm release name. If omitted it will use the application name + description: ReleaseName is the Helm release name to use. If omitted it will use the application name type: string valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -224,10 +227,10 @@ spec: type: string type: array values: - description: Values is Helm values, typically defined as a block + description: Values specifies Helm values to be passed to helm template, typically defined as a block type: string version: - description: Version is the Helm version to use for templating with + description: Version is the Helm version to use for templating (either "2" or "3") type: string type: object ksonnet: @@ -259,42 +262,45 @@ spec: commonAnnotations: additionalProperties: type: string - description: CommonAnnotations adds additional kustomize commonAnnotations + description: CommonAnnotations is a list of additional annotations to add to rendered manifests type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize commonLabels + description: CommonLabels is a list of additional labels to add to rendered manifests type: object images: - description: Images are kustomize image overrides + description: Images is a list of Kustomize image override specifications items: + description: KustomizeImage represents a Kustomize image definition in the format [old_image_name=]: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources for kustomize apps + description: NamePrefix is a prefix appended to resources for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources for kustomize apps + description: NameSuffix is a suffix appended to resources for Kustomize apps type: string version: - description: Version contains optional Kustomize version + description: Version controls which version of Kustomize to use for rendering manifests type: string type: object path: - description: Path is a directory path within the Git repository + description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. type: string plugin: description: ConfigManagementPlugin holds config management plugin specific options properties: env: + description: Env is a list of environment variable entries items: + description: EnvEntry represents an entry in the application's environment properties: name: - description: the name, usually uppercase + description: Name is the name of the variable, usually expressed in uppercase type: string value: - description: the value + description: Value is the value of the variable type: string required: - name @@ -305,10 +311,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application manifests + description: RepoURL is the URL to the repository (Git or Helm) that contains the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD + description: TargetRevision defines the revision of the source to sync the application to. In case of Git, this can be commit, tag, or branch. If omitted, will equal to HEAD. In case of Helm, this is a semver tag for the Chart's version. type: string required: - repoURL @@ -342,20 +348,20 @@ spec: description: ApplicationSpec represents desired application state. Contains link to repository with application definition and additional parameters link definition revision. properties: destination: - description: Destination overrides the kubernetes server and namespace defined in the environment ksonnet app.yaml + description: Destination is a reference to the target Kubernetes server and namespace properties: name: - description: Name of the destination cluster which can be used instead of server (url) field + description: Name is an alternate way of specifying the target cluster by its symbolic name type: string namespace: - description: Namespace overrides the environment namespace value in the ksonnet app.yaml + description: Namespace specifies the target namespace for the application's resources. The namespace will only be set for namespace-scoped resources that have not set a value for .metadata.namespace type: string server: - description: Server overrides the environment server value in the ksonnet app.yaml + description: Server specifies the URL of the target cluster and must be set to the Kubernetes control plane API type: string type: object ignoreDifferences: - description: IgnoreDifferences controls resources fields which should be ignored during comparison + description: IgnoreDifferences is a list of resources and their fields which should be ignored during comparison items: description: ResourceIgnoreDifferences contains resource filter and list of json paths which should be ignored during comparison with live state. properties: @@ -377,7 +383,7 @@ spec: type: object type: array info: - description: Infos contains a list of useful information (URLs, email addresses, and plain text) that relates to the application + description: Info contains a list of information (URLs, email addresses, and plain text) that relates to the application items: properties: name: @@ -390,30 +396,34 @@ spec: type: object type: array project: - description: Project is a application project name. Empty name means that application belongs to 'default' project. + description: Project is a reference to the project this application belongs to. The empty string means that application belongs to the 'default' project. type: string revisionHistoryLimit: - description: This limits this number of items kept in the apps revision history. This should only be changed in exceptional circumstances. Setting to zero will store no history. This will reduce storage used. Increasing will increase the space used to store the history, so we do not recommend increasing it. Default is 10. + description: RevisionHistoryLimit limits the number of items kept in the application's revision history, which is used for informational purposes as well as for rollbacks to previous versions. This should only be changed in exceptional circumstances. Setting to zero will store no history. This will reduce storage used. Increasing will increase the space used to store the history, so we do not recommend increasing it. Default is 10. format: int64 type: integer source: - description: Source is a reference to the location ksonnet application definition + description: Source is a reference to the location of the application's manifests or chart properties: chart: - description: Chart is a Helm chart name + description: Chart is a Helm chart name, and must be specified for applications sourced from a Helm repo. type: string directory: description: Directory holds path/directory specific options properties: exclude: + description: Exclude contains a glob pattern to match paths against that should be explicitly excluded from being used during manifest generation + type: string + include: + description: Include contains a glob pattern to match paths against that should be explicitly included during manifest generation type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific options + description: Jsonnet holds options specific to Jsonnet properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -434,7 +444,7 @@ spec: tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -449,6 +459,7 @@ spec: type: array type: object recurse: + description: Recurse specifies whether to scan a directory recursively for manifests type: boolean type: object helm: @@ -457,34 +468,34 @@ spec: fileParameters: description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to a helm template + description: HelmFileParameter is a file parameter that's passed to helm template during manifest generation properties: name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string path: - description: Path is the path value for the helm parameter + description: Path is the path to the file containing the values for the Helm parameter type: string type: object type: array parameters: - description: Parameters are parameters to the helm template + description: Parameters is a list of Helm parameters which are passed to the helm template command upon manifest generation items: - description: HelmParameter is a parameter to a helm template + description: HelmParameter is a parameter that's passed to helm template during manifest generation properties: forceString: description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string value: - description: Value is the value for the helm parameter + description: Value is the value for the Helm parameter type: string type: object type: array releaseName: - description: The Helm release name. If omitted it will use the application name + description: ReleaseName is the Helm release name to use. If omitted it will use the application name type: string valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -492,10 +503,10 @@ spec: type: string type: array values: - description: Values is Helm values, typically defined as a block + description: Values specifies Helm values to be passed to helm template, typically defined as a block type: string version: - description: Version is the Helm version to use for templating with + description: Version is the Helm version to use for templating (either "2" or "3") type: string type: object ksonnet: @@ -527,42 +538,45 @@ spec: commonAnnotations: additionalProperties: type: string - description: CommonAnnotations adds additional kustomize commonAnnotations + description: CommonAnnotations is a list of additional annotations to add to rendered manifests type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize commonLabels + description: CommonLabels is a list of additional labels to add to rendered manifests type: object images: - description: Images are kustomize image overrides + description: Images is a list of Kustomize image override specifications items: + description: KustomizeImage represents a Kustomize image definition in the format [old_image_name=]: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources for kustomize apps + description: NamePrefix is a prefix appended to resources for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources for kustomize apps + description: NameSuffix is a suffix appended to resources for Kustomize apps type: string version: - description: Version contains optional Kustomize version + description: Version controls which version of Kustomize to use for rendering manifests type: string type: object path: - description: Path is a directory path within the Git repository + description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. type: string plugin: description: ConfigManagementPlugin holds config management plugin specific options properties: env: + description: Env is a list of environment variable entries items: + description: EnvEntry represents an entry in the application's environment properties: name: - description: the name, usually uppercase + description: Name is the name of the variable, usually expressed in uppercase type: string value: - description: the value + description: Value is the value of the variable type: string required: - name @@ -573,16 +587,16 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application manifests + description: RepoURL is the URL to the repository (Git or Helm) that contains the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD + description: TargetRevision defines the revision of the source to sync the application to. In case of Git, this can be commit, tag, or branch. If omitted, will equal to HEAD. In case of Helm, this is a semver tag for the Chart's version. type: string required: - repoURL type: object syncPolicy: - description: SyncPolicy controls when a sync will be performed + description: SyncPolicy controls when and how a sync will be performed properties: automated: description: Automated will keep an application synced to the target revision @@ -591,17 +605,17 @@ spec: description: 'AllowEmpty allows apps have zero live resources (default: false)' type: boolean prune: - description: 'Prune will prune resources automatically as part of automated sync (default: false)' + description: 'Prune specifies whether to delete resources from the cluster that are not found in the sources anymore as part of automated sync (default: false)' type: boolean selfHeal: - description: 'SelfHeal enables auto-syncing if (default: false)' + description: 'SelfHeal specifes whether to revert resources back to their desired state upon modification in the cluster (default: false)' type: boolean type: object retry: description: Retry controls failed sync retry behavior properties: backoff: - description: Backoff is a backoff strategy + description: Backoff controls how to backoff on subsequent retries of failed syncs properties: duration: description: Duration is the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h") @@ -615,7 +629,7 @@ spec: type: string type: object limit: - description: Limit is the maximum number of attempts when retrying a container + description: Limit is the maximum number of attempts for retrying a failed sync. If set to 0, no retries will be performed. format: int64 type: integer type: object @@ -631,14 +645,15 @@ spec: - source type: object status: - description: ApplicationStatus contains information about application sync, health status + description: ApplicationStatus contains status information for the application properties: conditions: + description: Conditions is a list of currently observed application conditions items: - description: ApplicationCondition contains details about current application condition + description: ApplicationCondition contains details about an application condition, which is usally an error or warning properties: lastTransitionTime: - description: LastTransitionTime is the time the condition was first observed. + description: LastTransitionTime is the time the condition was last observed format: date-time type: string message: @@ -653,24 +668,26 @@ spec: type: object type: array health: + description: Health contains information about the application's current health status properties: message: + description: Message is a human-readable informational message describing the health status type: string status: - description: Represents resource health status + description: Status holds the status code of the application or resource type: string type: object history: - description: RevisionHistories is a array of history, oldest first and newest last + description: History contains information about the application's sync history items: - description: RevisionHistory contains information relevant to an application deployment + description: RevisionHistory contains history information about a previous sync properties: deployStartedAt: - description: DeployStartedAt holds the time the deployment started + description: DeployStartedAt holds the time the sync operation started format: date-time type: string deployedAt: - description: DeployedAt holds the time the deployment completed + description: DeployedAt holds the time the sync operation completed format: date-time type: string id: @@ -678,26 +695,30 @@ spec: format: int64 type: integer revision: - description: Revision holds the revision of the sync + description: Revision holds the revision the sync was performed against type: string source: - description: ApplicationSource contains information about github repository, path within repository and target application environment. + description: Source is a reference to the application source used for the sync operation properties: chart: - description: Chart is a Helm chart name + description: Chart is a Helm chart name, and must be specified for applications sourced from a Helm repo. type: string directory: description: Directory holds path/directory specific options properties: exclude: + description: Exclude contains a glob pattern to match paths against that should be explicitly excluded from being used during manifest generation + type: string + include: + description: Include contains a glob pattern to match paths against that should be explicitly included during manifest generation type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific options + description: Jsonnet holds options specific to Jsonnet properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -718,7 +739,7 @@ spec: tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -733,6 +754,7 @@ spec: type: array type: object recurse: + description: Recurse specifies whether to scan a directory recursively for manifests type: boolean type: object helm: @@ -741,34 +763,34 @@ spec: fileParameters: description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to a helm template + description: HelmFileParameter is a file parameter that's passed to helm template during manifest generation properties: name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string path: - description: Path is the path value for the helm parameter + description: Path is the path to the file containing the values for the Helm parameter type: string type: object type: array parameters: - description: Parameters are parameters to the helm template + description: Parameters is a list of Helm parameters which are passed to the helm template command upon manifest generation items: - description: HelmParameter is a parameter to a helm template + description: HelmParameter is a parameter that's passed to helm template during manifest generation properties: forceString: description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string value: - description: Value is the value for the helm parameter + description: Value is the value for the Helm parameter type: string type: object type: array releaseName: - description: The Helm release name. If omitted it will use the application name + description: ReleaseName is the Helm release name to use. If omitted it will use the application name type: string valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -776,10 +798,10 @@ spec: type: string type: array values: - description: Values is Helm values, typically defined as a block + description: Values specifies Helm values to be passed to helm template, typically defined as a block type: string version: - description: Version is the Helm version to use for templating with + description: Version is the Helm version to use for templating (either "2" or "3") type: string type: object ksonnet: @@ -811,42 +833,45 @@ spec: commonAnnotations: additionalProperties: type: string - description: CommonAnnotations adds additional kustomize commonAnnotations + description: CommonAnnotations is a list of additional annotations to add to rendered manifests type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize commonLabels + description: CommonLabels is a list of additional labels to add to rendered manifests type: object images: - description: Images are kustomize image overrides + description: Images is a list of Kustomize image override specifications items: + description: KustomizeImage represents a Kustomize image definition in the format [old_image_name=]: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources for kustomize apps + description: NamePrefix is a prefix appended to resources for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources for kustomize apps + description: NameSuffix is a suffix appended to resources for Kustomize apps type: string version: - description: Version contains optional Kustomize version + description: Version controls which version of Kustomize to use for rendering manifests type: string type: object path: - description: Path is a directory path within the Git repository + description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. type: string plugin: description: ConfigManagementPlugin holds config management plugin specific options properties: env: + description: Env is a list of environment variable entries items: + description: EnvEntry represents an entry in the application's environment properties: name: - description: the name, usually uppercase + description: Name is the name of the variable, usually expressed in uppercase type: string value: - description: the value + description: Value is the value of the variable type: string required: - name @@ -857,10 +882,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application manifests + description: RepoURL is the URL to the repository (Git or Helm) that contains the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD + description: TargetRevision defines the revision of the source to sync the application to. In case of Git, this can be commit, tag, or branch. If omitted, will equal to HEAD. In case of Helm, this is a semver tag for the Chart's version. type: string required: - repoURL @@ -876,19 +901,20 @@ spec: format: date-time type: string operationState: - description: OperationState contains information about state of currently performing operation on application. + description: OperationState contains information about any ongoing operations, such as a sync properties: finishedAt: description: FinishedAt contains time of operation completion format: date-time type: string message: - description: Message hold any pertinent messages when attempting to perform operation (typically errors). + description: Message holds any pertinent messages when attempting to perform operation (typically errors). type: string operation: description: Operation is the original requested operation properties: info: + description: Info is a list of informational items for this operation items: properties: name: @@ -901,20 +927,20 @@ spec: type: object type: array initiatedBy: - description: OperationInitiator holds information about the operation initiator + description: InitiatedBy contains information about who initiated the operations properties: automated: description: Automated is set to true if operation was initiated automatically by the application controller. type: boolean username: - description: Name of a user who started operation. + description: Username contains the name of a user who started operation type: string type: object retry: - description: Retry controls failed sync retry behavior + description: Retry controls the strategy to apply if a sync fails properties: backoff: - description: Backoff is a backoff strategy + description: Backoff controls how to backoff on subsequent retries of failed syncs properties: duration: description: Duration is the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h") @@ -928,15 +954,15 @@ spec: type: string type: object limit: - description: Limit is the maximum number of attempts when retrying a container + description: Limit is the maximum number of attempts for retrying a failed sync. If set to 0, no retries will be performed. format: int64 type: integer type: object sync: - description: SyncOperation contains sync operation details. + description: Sync contains parameters for the operation properties: dryRun: - description: DryRun will perform a `kubectl apply --dry-run` without actually performing the sync + description: DryRun specifies to perform a `kubectl apply --dry-run` without actually performing the sync type: boolean manifests: description: Manifests is an optional field that overrides sync source with a local directory for development @@ -944,10 +970,10 @@ spec: type: string type: array prune: - description: Prune deletes resources that are no longer tracked in git + description: Prune specifies to delete resources from the cluster that are no longer tracked in git type: boolean resources: - description: Resources describes which resources to sync + description: Resources describes which resources shall be part of the sync items: description: SyncOperationResource contains resources to sync. properties: @@ -965,26 +991,30 @@ spec: type: object type: array revision: - description: Revision is the revision in which to sync the application to. If omitted, will use the revision specified in app spec. + description: Revision is the revision (Git) or chart version (Helm) 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 + description: Source overrides the source definition set in the application. This is typically set in a Rollback operation and is nil during a Sync operation properties: chart: - description: Chart is a Helm chart name + description: Chart is a Helm chart name, and must be specified for applications sourced from a Helm repo. type: string directory: description: Directory holds path/directory specific options properties: exclude: + description: Exclude contains a glob pattern to match paths against that should be explicitly excluded from being used during manifest generation + type: string + include: + description: Include contains a glob pattern to match paths against that should be explicitly included during manifest generation type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific options + description: Jsonnet holds options specific to Jsonnet properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -1005,7 +1035,7 @@ spec: tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -1020,6 +1050,7 @@ spec: type: array type: object recurse: + description: Recurse specifies whether to scan a directory recursively for manifests type: boolean type: object helm: @@ -1028,34 +1059,34 @@ spec: fileParameters: description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to a helm template + description: HelmFileParameter is a file parameter that's passed to helm template during manifest generation properties: name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string path: - description: Path is the path value for the helm parameter + description: Path is the path to the file containing the values for the Helm parameter type: string type: object type: array parameters: - description: Parameters are parameters to the helm template + description: Parameters is a list of Helm parameters which are passed to the helm template command upon manifest generation items: - description: HelmParameter is a parameter to a helm template + description: HelmParameter is a parameter that's passed to helm template during manifest generation properties: forceString: description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string value: - description: Value is the value for the helm parameter + description: Value is the value for the Helm parameter type: string type: object type: array releaseName: - description: The Helm release name. If omitted it will use the application name + description: ReleaseName is the Helm release name to use. If omitted it will use the application name type: string valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -1063,10 +1094,10 @@ spec: type: string type: array values: - description: Values is Helm values, typically defined as a block + description: Values specifies Helm values to be passed to helm template, typically defined as a block type: string version: - description: Version is the Helm version to use for templating with + description: Version is the Helm version to use for templating (either "2" or "3") type: string type: object ksonnet: @@ -1098,42 +1129,45 @@ spec: commonAnnotations: additionalProperties: type: string - description: CommonAnnotations adds additional kustomize commonAnnotations + description: CommonAnnotations is a list of additional annotations to add to rendered manifests type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize commonLabels + description: CommonLabels is a list of additional labels to add to rendered manifests type: object images: - description: Images are kustomize image overrides + description: Images is a list of Kustomize image override specifications items: + description: KustomizeImage represents a Kustomize image definition in the format [old_image_name=]: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources for kustomize apps + description: NamePrefix is a prefix appended to resources for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources for kustomize apps + description: NameSuffix is a suffix appended to resources for Kustomize apps type: string version: - description: Version contains optional Kustomize version + description: Version controls which version of Kustomize to use for rendering manifests type: string type: object path: - description: Path is a directory path within the Git repository + description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. type: string plugin: description: ConfigManagementPlugin holds config management plugin specific options properties: env: + description: Env is a list of environment variable entries items: + description: EnvEntry represents an entry in the application's environment properties: name: - description: the name, usually uppercase + description: Name is the name of the variable, usually expressed in uppercase type: string value: - description: the value + description: Value is the value of the variable type: string required: - name @@ -1144,10 +1178,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application manifests + description: RepoURL is the URL to the repository (Git or Helm) that contains the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD + description: TargetRevision defines the revision of the source to sync the application to. In case of Git, this can be commit, tag, or branch. If omitted, will equal to HEAD. In case of Helm, this is a semver tag for the Chart's version. type: string required: - repoURL @@ -1192,34 +1226,39 @@ spec: description: SyncResult is the result of a Sync operation properties: resources: - description: Resources holds the sync result of each individual resource + description: Resources contains a list of sync result items for each individual resource in a sync operation items: description: ResourceResult holds the operation result details of a specific resource properties: group: + description: Group specifies the API group of the resource type: string hookPhase: - description: 'the state of any operation associated with this resource OR hook note: can contain values for non-hook resources' + description: HookPhase contains the state of any operation associated with this resource OR hook This can also contain values for non-hook resources. type: string hookType: - description: the type of the hook, empty for non-hook resources + description: HookType specifies the type of the hook. Empty for non-hook resources type: string kind: + description: Kind specifies the API kind of the resource type: string message: - description: message for the last sync OR operation + description: Message contains an informational or error message for the last sync OR operation type: string name: + description: Name specifies the name of the resource type: string namespace: + description: Namespace specifies the target namespace of the resource type: string status: - description: the final result of the sync, this is be empty if the resources is yet to be applied/pruned and is always zero-value for hooks + description: Status holds the final result of the sync. Will be empty if the resources is yet to be applied/pruned and is always zero-value for hooks type: string syncPhase: - description: indicates the particular phase of the sync that this is for + description: SyncPhase indicates the particular phase of the sync that this result was acquired in type: string version: + description: Version specifies the API version of the resource type: string required: - group @@ -1230,26 +1269,30 @@ spec: type: object type: array revision: - description: Revision holds the revision of the sync + description: Revision holds the revision this sync operation was performed to 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 + description: Chart is a Helm chart name, and must be specified for applications sourced from a Helm repo. type: string directory: description: Directory holds path/directory specific options properties: exclude: + description: Exclude contains a glob pattern to match paths against that should be explicitly excluded from being used during manifest generation + type: string + include: + description: Include contains a glob pattern to match paths against that should be explicitly included during manifest generation type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific options + description: Jsonnet holds options specific to Jsonnet properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -1270,7 +1313,7 @@ spec: tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -1285,6 +1328,7 @@ spec: type: array type: object recurse: + description: Recurse specifies whether to scan a directory recursively for manifests type: boolean type: object helm: @@ -1293,34 +1337,34 @@ spec: fileParameters: description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to a helm template + description: HelmFileParameter is a file parameter that's passed to helm template during manifest generation properties: name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string path: - description: Path is the path value for the helm parameter + description: Path is the path to the file containing the values for the Helm parameter type: string type: object type: array parameters: - description: Parameters are parameters to the helm template + description: Parameters is a list of Helm parameters which are passed to the helm template command upon manifest generation items: - description: HelmParameter is a parameter to a helm template + description: HelmParameter is a parameter that's passed to helm template during manifest generation properties: forceString: description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string value: - description: Value is the value for the helm parameter + description: Value is the value for the Helm parameter type: string type: object type: array releaseName: - description: The Helm release name. If omitted it will use the application name + description: ReleaseName is the Helm release name to use. If omitted it will use the application name type: string valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -1328,10 +1372,10 @@ spec: type: string type: array values: - description: Values is Helm values, typically defined as a block + description: Values specifies Helm values to be passed to helm template, typically defined as a block type: string version: - description: Version is the Helm version to use for templating with + description: Version is the Helm version to use for templating (either "2" or "3") type: string type: object ksonnet: @@ -1363,42 +1407,45 @@ spec: commonAnnotations: additionalProperties: type: string - description: CommonAnnotations adds additional kustomize commonAnnotations + description: CommonAnnotations is a list of additional annotations to add to rendered manifests type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize commonLabels + description: CommonLabels is a list of additional labels to add to rendered manifests type: object images: - description: Images are kustomize image overrides + description: Images is a list of Kustomize image override specifications items: + description: KustomizeImage represents a Kustomize image definition in the format [old_image_name=]: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources for kustomize apps + description: NamePrefix is a prefix appended to resources for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources for kustomize apps + description: NameSuffix is a suffix appended to resources for Kustomize apps type: string version: - description: Version contains optional Kustomize version + description: Version controls which version of Kustomize to use for rendering manifests type: string type: object path: - description: Path is a directory path within the Git repository + description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. type: string plugin: description: ConfigManagementPlugin holds config management plugin specific options properties: env: + description: Env is a list of environment variable entries items: + description: EnvEntry represents an entry in the application's environment properties: name: - description: the name, usually uppercase + description: Name is the name of the variable, usually expressed in uppercase type: string value: - description: the value + description: Value is the value of the variable type: string required: - name @@ -1409,10 +1456,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application manifests + description: RepoURL is the URL to the repository (Git or Helm) that contains the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD + description: TargetRevision defines the revision of the source to sync the application to. In case of Git, this can be commit, tag, or branch. If omitted, will equal to HEAD. In case of Helm, this is a semver tag for the Chart's version. type: string required: - repoURL @@ -1430,17 +1477,20 @@ spec: format: date-time type: string resources: + description: Resources is a list of Kubernetes resources managed by this application items: - description: ResourceStatus holds the current sync and health status of a resource + description: 'ResourceStatus holds the current sync and health status of a resource TODO: describe members of this type' properties: group: type: string health: + description: HealthStatus contains information about the currently observed health state of an application or resource properties: message: + description: Message is a human-readable informational message describing the health status type: string status: - description: Represents resource health status + description: Status holds the status code of the application or resource type: string type: object hook: @@ -1461,8 +1511,10 @@ spec: type: object type: array sourceType: + description: SourceType specifies the type of this application type: string summary: + description: Summary contains a list of URLs and container images used by this application properties: externalURLs: description: ExternalURLs holds all external URLs of application child resources. @@ -1476,42 +1528,46 @@ spec: type: array type: object sync: - description: SyncStatus is a comparison result of application spec and deployed application. + description: Sync contains information about the application's current sync status properties: comparedTo: - description: ComparedTo contains application source and target which was used for resources comparison + description: ComparedTo contains information about what has been compared properties: destination: - description: ApplicationDestination contains deployment destination information + description: Destination is a reference to the application's destination used for comparison properties: name: - description: Name of the destination cluster which can be used instead of server (url) field + description: Name is an alternate way of specifying the target cluster by its symbolic name type: string namespace: - description: Namespace overrides the environment namespace value in the ksonnet app.yaml + description: Namespace specifies the target namespace for the application's resources. The namespace will only be set for namespace-scoped resources that have not set a value for .metadata.namespace type: string server: - description: Server overrides the environment server value in the ksonnet app.yaml + description: Server specifies the URL of the target cluster and must be set to the Kubernetes control plane API type: string type: object source: - description: ApplicationSource contains information about github repository, path within repository and target application environment. + description: Source is a reference to the application's source used for comparison properties: chart: - description: Chart is a Helm chart name + description: Chart is a Helm chart name, and must be specified for applications sourced from a Helm repo. type: string directory: description: Directory holds path/directory specific options properties: exclude: + description: Exclude contains a glob pattern to match paths against that should be explicitly excluded from being used during manifest generation + type: string + include: + description: Include contains a glob pattern to match paths against that should be explicitly included during manifest generation type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific options + description: Jsonnet holds options specific to Jsonnet properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -1532,7 +1588,7 @@ spec: tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable + description: JsonnetVar represents a variable to be passed to jsonnet during manifest generation properties: code: type: boolean @@ -1547,6 +1603,7 @@ spec: type: array type: object recurse: + description: Recurse specifies whether to scan a directory recursively for manifests type: boolean type: object helm: @@ -1555,34 +1612,34 @@ spec: fileParameters: description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to a helm template + description: HelmFileParameter is a file parameter that's passed to helm template during manifest generation properties: name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string path: - description: Path is the path value for the helm parameter + description: Path is the path to the file containing the values for the Helm parameter type: string type: object type: array parameters: - description: Parameters are parameters to the helm template + description: Parameters is a list of Helm parameters which are passed to the helm template command upon manifest generation items: - description: HelmParameter is a parameter to a helm template + description: HelmParameter is a parameter that's passed to helm template during manifest generation properties: forceString: description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: - description: Name is the name of the helm parameter + description: Name is the name of the Helm parameter type: string value: - description: Value is the value for the helm parameter + description: Value is the value for the Helm parameter type: string type: object type: array releaseName: - description: The Helm release name. If omitted it will use the application name + description: ReleaseName is the Helm release name to use. If omitted it will use the application name type: string valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -1590,10 +1647,10 @@ spec: type: string type: array values: - description: Values is Helm values, typically defined as a block + description: Values specifies Helm values to be passed to helm template, typically defined as a block type: string version: - description: Version is the Helm version to use for templating with + description: Version is the Helm version to use for templating (either "2" or "3") type: string type: object ksonnet: @@ -1625,42 +1682,45 @@ spec: commonAnnotations: additionalProperties: type: string - description: CommonAnnotations adds additional kustomize commonAnnotations + description: CommonAnnotations is a list of additional annotations to add to rendered manifests type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize commonLabels + description: CommonLabels is a list of additional labels to add to rendered manifests type: object images: - description: Images are kustomize image overrides + description: Images is a list of Kustomize image override specifications items: + description: KustomizeImage represents a Kustomize image definition in the format [old_image_name=]: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources for kustomize apps + description: NamePrefix is a prefix appended to resources for Kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources for kustomize apps + description: NameSuffix is a suffix appended to resources for Kustomize apps type: string version: - description: Version contains optional Kustomize version + description: Version controls which version of Kustomize to use for rendering manifests type: string type: object path: - description: Path is a directory path within the Git repository + description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. type: string plugin: description: ConfigManagementPlugin holds config management plugin specific options properties: env: + description: Env is a list of environment variable entries items: + description: EnvEntry represents an entry in the application's environment properties: name: - description: the name, usually uppercase + description: Name is the name of the variable, usually expressed in uppercase type: string value: - description: the value + description: Value is the value of the variable type: string required: - name @@ -1671,10 +1731,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application manifests + description: RepoURL is the URL to the repository (Git or Helm) that contains the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD + description: TargetRevision defines the revision of the source to sync the application to. In case of Git, this can be commit, tag, or branch. If omitted, will equal to HEAD. In case of Helm, this is a semver tag for the Chart's version. type: string required: - repoURL @@ -1684,9 +1744,10 @@ spec: - source type: object revision: + description: Revision contains information about the revision the comparison has been performed to type: string status: - description: SyncStatusCode is a type which represents possible comparison results + description: Status is the sync state of the comparison type: string required: - status @@ -1696,3 +1757,6 @@ spec: - metadata - spec type: object + served: true + storage: true + subresources: {} diff --git a/charts/argo-cd/crds/crd-project.yaml b/charts/argo-cd/crds/crd-project.yaml index 2dab45a5..40182848 100644 --- a/charts/argo-cd/crds/crd-project.yaml +++ b/charts/argo-cd/crds/crd-project.yaml @@ -20,8 +20,6 @@ spec: scope: Namespaced versions: - name: v1alpha1 - served: true - storage: true schema: openAPIV3Schema: description: 'AppProject provides a logical grouping of applications, providing controls for: * where the apps may deploy to (cluster whitelist) * what may be deployed (repository whitelist, resource whitelist/blacklist) * who can access these applications (roles, OIDC group claims bindings) * and what they can do (RBAC policies) * automation access to these roles (JWT tokens)' @@ -71,16 +69,16 @@ spec: destinations: description: Destinations contains list of destinations available for deployment items: - description: ApplicationDestination contains deployment destination information + description: ApplicationDestination holds information about the application's destination properties: name: - description: Name of the destination cluster which can be used instead of server (url) field + description: Name is an alternate way of specifying the target cluster by its symbolic name type: string namespace: - description: Namespace overrides the environment namespace value in the ksonnet app.yaml + description: Namespace specifies the target namespace for the application's resources. The namespace will only be set for namespace-scoped resources that have not set a value for .metadata.namespace type: string server: - description: Server overrides the environment server value in the ksonnet app.yaml + description: Server specifies the URL of the target cluster and must be set to the Kubernetes control plane API type: string type: object type: array @@ -116,7 +114,9 @@ spec: description: OrphanedResources specifies if controller should monitor orphaned resources of apps in this project properties: ignore: + description: Ignore contains a list of resources that are to be excluded from orphaned resources monitoring items: + description: OrphanedResourceKey is a reference to a resource to be ignored from properties: group: type: string @@ -173,7 +173,7 @@ spec: type: object type: array signatureKeys: - description: List of PGP key IDs that commits to be synced to must be signed with + description: SignatureKeys contains a list of PGP key IDs that commits in Git must be signed with in order to be allowed for sync items: description: SignatureKey is the specification of a key required to verify commit signatures with properties: @@ -225,34 +225,35 @@ spec: type: array type: object status: - description: Status of the AppProject + description: AppProjectStatus contains status information for AppProject CRs properties: jwtTokensByRole: - description: JWT Tokens issued for each of the roles in the project additionalProperties: + description: JWTTokens represents a list of JWT tokens properties: - items: - description: List of JWT Tokens issued for the role - items: - description: Holds the issuedAt and expiresAt values of the token + items: + items: + description: JWTToken holds the issuedAt and expiresAt values of a token properties: exp: - description: The expiresAt value of a token format: int64 type: integer iat: - description: The issuedAt value of a token format: int64 type: integer id: - description: ID of the token type: string + required: + - iat type: object type: array type: object + description: JWTTokensByRole contains a list of JWT tokens issued for a given role type: object type: object required: - metadata - spec type: object + served: true + storage: true diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml index 6fe98a24..7c87bce8 100755 --- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml @@ -92,8 +92,10 @@ spec: timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.controller.readinessProbe.successThreshold }} failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }} -{{- if .Values.controller.volumeMounts }} volumeMounts: + - mountPath: /app/config/controller/tls + name: argocd-repo-server-tls +{{- if .Values.controller.volumeMounts }} {{- toYaml .Values.controller.volumeMounts | nindent 10}} {{- end }} resources: @@ -115,8 +117,19 @@ spec: hostAliases: {{ toYaml . | indent 6 }} {{- end }} -{{- if .Values.controller.volumes }} volumes: + - name: argocd-repo-server-tls + secret: + items: + - key: tls.crt + path: tls.crt + - key: tls.key + path: tls.key + - key: ca.crt + path: ca.crt + optional: true + secretName: argocd-repo-server-tls +{{- if .Values.controller.volumes }} {{- toYaml .Values.controller.volumes | nindent 8 }} {{- end }} {{- if .Values.controller.priorityClassName }} diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 47f04d9d..7350db37 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -81,6 +81,8 @@ spec: - mountPath: /app/config/tls name: tls-certs {{- end }} + - mountPath: /app/config/reposerver/tls + name: argocd-repo-server-tls - mountPath: /tmp name: tmp-dir ports: @@ -143,6 +145,17 @@ spec: name: argocd-tls-certs-cm name: tls-certs {{- end }} + - name: argocd-repo-server-tls + secret: + items: + - key: tls.crt + path: tls.crt + - key: tls.key + path: tls.key + - key: ca.crt + path: ca.crt + optional: true + secretName: argocd-repo-server-tls - emptyDir: {} name: tmp-dir {{- if .Values.repoServer.initContainers }} diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index 4ae1c4c2..d12c8446 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -80,6 +80,8 @@ spec: - mountPath: /app/config/tls name: tls-certs {{- end }} + - mountPath: /app/config/server/tls + name: argocd-repo-server-tls ports: - name: {{ .Values.server.name }} containerPort: {{ .Values.server.containerPort }} @@ -149,6 +151,17 @@ spec: name: argocd-tls-certs-cm name: tls-certs {{- end }} + - name: argocd-repo-server-tls + secret: + items: + - key: tls.crt + path: tls.crt + - key: tls.key + path: tls.key + - key: ca.crt + path: ca.crt + optional: true + secretName: argocd-repo-server-tls {{- if .Values.server.priorityClassName }} priorityClassName: {{ .Values.server.priorityClassName }} {{- end }} diff --git a/charts/argo-cd/templates/redis/deployment.yaml b/charts/argo-cd/templates/redis/deployment.yaml index de88c0d3..f3dd7f05 100755 --- a/charts/argo-cd/templates/redis/deployment.yaml +++ b/charts/argo-cd/templates/redis/deployment.yaml @@ -41,11 +41,14 @@ spec: - "" - --appendonly - "no" + {{- with .Values.redis.extraArgs }} + {{- . | toYaml | nindent 8 }} + {{- end }} image: {{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }} imagePullPolicy: {{ .Values.redis.image.imagePullPolicy}} {{- if .Values.redis.containerSecurityContext }} securityContext: {{- toYaml .Values.redis.containerSecurityContext | nindent 10 }} - {{- end }} + {{- end }} {{- if .Values.redis.env }} env: {{- toYaml .Values.redis.env | nindent 8 }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index adc358f7..dc04e3eb 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -9,7 +9,7 @@ installCRDs: true global: image: - repository: argoproj/argocd + repository: quay.io/argoproj/argocd tag: v2.0.0 imagePullPolicy: IfNotPresent securityContext: {} @@ -27,8 +27,8 @@ controller: name: application-controller image: - repository: # argoproj/argocd - tag: # v1.7.11 + repository: # defaults to global.image.repository + tag: # defaults to global.image.tag imagePullPolicy: # IfNotPresent # If changing the number of replicas you must pass the number as ARGOCD_CONTROLLER_REPLICAS as an environment variable @@ -276,9 +276,15 @@ redis: image: repository: redis - tag: 5.0.10-alpine + tag: 6.2.1-alpine imagePullPolicy: IfNotPresent + ## Additional command line arguments to pass to redis-server + ## + extraArgs: [] + # - --bind + # - "0.0.0.0" + containerPort: 6379 servicePort: 6379 @@ -347,7 +353,7 @@ redis-ha: metrics: enabled: true image: - tag: 5.0.8-alpine + tag: 6.2.1-alpine ## Server server: @@ -363,8 +369,8 @@ server: targetMemoryUtilizationPercentage: 50 image: - repository: # argoproj/argocd - tag: # v1.7.11 + repository: # defaults to global.image.repository + tag: # defaults to global.image.tag imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-server @@ -733,8 +739,8 @@ repoServer: targetMemoryUtilizationPercentage: 50 image: - repository: # argoproj/argocd - tag: # v1.7.11 + repository: # defaults to global.image.repository + tag: # defaults to global.image.tag imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-repo-server From 72f71923f2b7e01a0651b404aefe6d62fb8aacfb Mon Sep 17 00:00:00 2001 From: t3mi Date: Mon, 26 Apr 2021 15:35:41 +0300 Subject: [PATCH 07/19] feat(argo-events): add priorityClassName and podLabels options (#610) Signed-off-by: t3mi --- charts/argo-events/Chart.yaml | 2 +- .../templates/eventbus-controller-deployment.yaml | 6 ++++++ .../templates/eventsource-controller-deployment.yaml | 6 ++++++ .../templates/sensor-controller-deployment.yaml | 6 ++++++ charts/argo-events/values.yaml | 12 +++++++++--- 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index 1f138c3c..c9f2ae12 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 1.3.2 +version: 1.3.3 keywords: - argo-events - sensor-controller diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml index 900daf41..e3631828 100644 --- a/charts/argo-events/templates/eventbus-controller-deployment.yaml +++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml @@ -18,6 +18,9 @@ spec: labels: app: {{ .Release.Name }}-{{ .Values.eventbusController.name }} release: {{ .Release.Name }} + {{- with .Values.eventbusController.podLabels }} + {{- tpl (toYaml .) $ | nindent 8 }} + {{- end }} {{- with .Values.eventbusController.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} {{- end }} @@ -52,6 +55,9 @@ spec: port: 8081 initialDelaySeconds: 3 periodSeconds: 3 + {{- with .Values.eventbusController.priorityClassName }} + priorityClassName: {{ . | quote }} + {{- end }} {{- with .Values.securityContext }} securityContext: {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml index 9fcd1eaf..a6522da6 100644 --- a/charts/argo-events/templates/eventsource-controller-deployment.yaml +++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml @@ -18,6 +18,9 @@ spec: labels: app: {{ .Release.Name }}-{{ .Values.eventsourceController.name }} release: {{ .Release.Name }} + {{- with .Values.eventsourceController.podLabels }} + {{- tpl (toYaml .) $ | nindent 8 }} + {{- end }} {{- with .Values.eventsourceController.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} {{- end }} @@ -50,6 +53,9 @@ spec: port: 8081 initialDelaySeconds: 3 periodSeconds: 3 + {{- with .Values.eventsourceController.priorityClassName }} + priorityClassName: {{ . | quote }} + {{- end }} {{- with .Values.securityContext }} securityContext: {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml index 371fe82f..e6a1c104 100644 --- a/charts/argo-events/templates/sensor-controller-deployment.yaml +++ b/charts/argo-events/templates/sensor-controller-deployment.yaml @@ -18,6 +18,9 @@ spec: labels: app: {{ .Release.Name }}-{{ .Values.sensorController.name }} release: {{ .Release.Name }} + {{- with .Values.sensorController.podLabels }} + {{- tpl (toYaml .) $ | nindent 8 }} + {{- end }} {{- with .Values.sensorController.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} {{- end }} @@ -50,6 +53,9 @@ spec: port: 8081 initialDelaySeconds: 3 periodSeconds: 3 + {{- with .Values.sensorController.priorityClassName }} + priorityClassName: {{ . | quote }} + {{- end }} {{- with .Values.securityContext }} securityContext: {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index ec251fe6..b786e260 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -50,7 +50,9 @@ sensorController: sensorImage: sensor podAnnotations: {} nodeSelector: {} - tolerations: {} + podLabels: {} + priorityClassName: "" + tolerations: [] affinity: {} eventsourceController: @@ -61,7 +63,9 @@ eventsourceController: eventsourceImage: eventsource podAnnotations: {} nodeSelector: {} - tolerations: {} + podLabels: {} + priorityClassName: "" + tolerations: [] affinity: {} eventbusController: @@ -71,7 +75,9 @@ eventbusController: replicaCount: 1 podAnnotations: {} nodeSelector: {} - tolerations: {} + podLabels: {} + priorityClassName: "" + tolerations: [] affinity: {} natsStreamingImage: nats-streaming:0.17.0 natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2 From 4e0bf1e19d75f3efc9f48f422440455a11f5c95a Mon Sep 17 00:00:00 2001 From: Sergey <41047934+1Psy@users.noreply.github.com> Date: Mon, 26 Apr 2021 21:55:12 +0300 Subject: [PATCH 08/19] fix(argocd-notifications): Changes to rules RBAC role. (#697) add role resourceNames argoproj-labs/argocd-notifications#199 allow configmap/secret list verb argoproj-labs/argocd-notifications#244 Signed-off-by: 1Psy <41047934+1Psy@users.noreply.github.com> --- charts/argocd-notifications/Chart.yaml | 2 +- .../templates/bots/slack/role.yaml | 18 +++++++++--------- .../argocd-notifications/templates/role.yaml | 19 +++++++++++++++++-- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index 881c18ae..04851ad0 100644 --- a/charts/argocd-notifications/Chart.yaml +++ b/charts/argocd-notifications/Chart.yaml @@ -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.1.2 +version: 1.1.3 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argocd-notifications/templates/bots/slack/role.yaml b/charts/argocd-notifications/templates/bots/slack/role.yaml index b509f6d4..5193a109 100644 --- a/charts/argocd-notifications/templates/bots/slack/role.yaml +++ b/charts/argocd-notifications/templates/bots/slack/role.yaml @@ -4,6 +4,15 @@ kind: Role metadata: name: {{ include "argocd-notifications.name" . }}-bot rules: +- apiGroups: + - "" + resources: + - secrets + - configmaps + verbs: + - get + - list + - watch - apiGroups: - argoproj.io resources: @@ -15,13 +24,4 @@ rules: - watch - update - patch -- apiGroups: - - "" - resources: - - secrets - - configmaps - verbs: - - get - - list - - watch {{ end }} diff --git a/charts/argocd-notifications/templates/role.yaml b/charts/argocd-notifications/templates/role.yaml index fcd99ef6..0b07afd7 100644 --- a/charts/argocd-notifications/templates/role.yaml +++ b/charts/argocd-notifications/templates/role.yaml @@ -19,9 +19,24 @@ rules: - apiGroups: - "" resources: + - configmaps - secrets + verbs: + - list + - watch +- apiGroups: + - "" + resourceNames: + - {{ include "argocd-notifications.name" . }}-cm + resources: - configmaps verbs: - get - - list - - watch +- apiGroups: + - "" + resourceNames: + - {{ include "argocd-notifications.name" . }}-secret + resources: + - secrets + verbs: + - get \ No newline at end of file From d40a9be8106a207067241c75557888a7127fa55b Mon Sep 17 00:00:00 2001 From: Geoffrey Gouez Date: Mon, 26 Apr 2021 23:38:11 +0200 Subject: [PATCH 09/19] feat(argocd-notifications): Optional ConfigMap for argocd-notifications (#656) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(argocd-notifications): Optional ConfigMap for argocd-notifications Signed-off-by: Cicatrice * feat(argocd-notifications): version bump Co-authored-by: Oliver Bähler Signed-off-by: Cicatrice Co-authored-by: Oliver Bähler --- charts/argocd-notifications/Chart.yaml | 2 +- charts/argocd-notifications/templates/configmap.yaml | 4 +++- charts/argocd-notifications/values.yaml | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index 04851ad0..12c03d53 100644 --- a/charts/argocd-notifications/Chart.yaml +++ b/charts/argocd-notifications/Chart.yaml @@ -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.1.3 +version: 1.2.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argocd-notifications/templates/configmap.yaml b/charts/argocd-notifications/templates/configmap.yaml index 9090a162..442234bc 100644 --- a/charts/argocd-notifications/templates/configmap.yaml +++ b/charts/argocd-notifications/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{ if .Values.cm.create }} apiVersion: v1 kind: ConfigMap metadata: @@ -19,4 +20,5 @@ data: {{- end }} {{- with .Values.triggers }} {{- toYaml . | nindent 2 }} - {{- end }} \ No newline at end of file + {{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/argocd-notifications/values.yaml b/charts/argocd-notifications/values.yaml index 0a27e643..ace4c84e 100644 --- a/charts/argocd-notifications/values.yaml +++ b/charts/argocd-notifications/values.yaml @@ -88,6 +88,10 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: argocd-notifications-controller +cm: + # Whether helm chart creates controller config map + create: true + subscriptions: # For more information: https://argocd-notifications.readthedocs.io/en/stable/subscriptions/ From 7efd2d4a44da349c508ec50a8f3630c47ad1456d Mon Sep 17 00:00:00 2001 From: "Wen-Chih (Ryan) Lo" Date: Wed, 28 Apr 2021 02:33:31 +0800 Subject: [PATCH 10/19] chore(argo): Fix service name in argo/templates/NOTES.txt (#701) Signed-off-by: Ryan Lo --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/NOTES.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 741fa2e6..3f10ee6f 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.12.5 description: A Helm chart for Argo Workflows name: argo -version: 0.16.9 +version: 0.16.10 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/NOTES.txt b/charts/argo/templates/NOTES.txt index 327b262d..7b4c02f0 100644 --- a/charts/argo/templates/NOTES.txt +++ b/charts/argo/templates/NOTES.txt @@ -11,6 +11,6 @@ argo submit https://raw.githubusercontent.com/argoproj/argo/master/examples/hell 3. Access Minio UI and create bucket '{{ .Values.minio.defaultBucket.name }}'. Minio UI is available on port 9000 and available via external URL. URL might be retrieved using following command: -kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ .Release.Name }}-minio-svc +kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ .Release.Name }}-minio {{ end }} From dbec4ad82e98770e7768eda751e771683fadf0db Mon Sep 17 00:00:00 2001 From: jandersen-plaid <52045989+jandersen-plaid@users.noreply.github.com> Date: Wed, 5 May 2021 18:59:18 -0400 Subject: [PATCH 11/19] fix: spec.preserveUnknownFields must be set to false to allow upgrades from v1beta1 (#709) Signed-off-by: Jack Andersen --- charts/argo-rollouts/Chart.yaml | 2 +- charts/argo-rollouts/templates/crds/analysis-run-crd.yaml | 1 + charts/argo-rollouts/templates/crds/analysis-template-crd.yaml | 1 + .../templates/crds/cluster-analysis-template-crd.yaml | 1 + charts/argo-rollouts/templates/crds/experiment-crd.yaml | 1 + charts/argo-rollouts/templates/crds/rollout-crd.yaml | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index bf8cd3b3..99269837 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.10.2" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 0.5.0 +version: 0.5.1 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml index 0ddf3ca3..b70b6f0b 100644 --- a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - ar singular: analysisrun + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: diff --git a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml index 0854fc4c..4712ae2d 100644 --- a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - at singular: analysistemplate + preserveUnknownFields: false scope: Namespaced versions: - name: v1alpha1 diff --git a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml index dd9d89cd..72832f03 100644 --- a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - cat singular: clusteranalysistemplate + preserveUnknownFields: false scope: Cluster versions: - name: v1alpha1 diff --git a/charts/argo-rollouts/templates/crds/experiment-crd.yaml b/charts/argo-rollouts/templates/crds/experiment-crd.yaml index 6fec00ab..1fa5b261 100644 --- a/charts/argo-rollouts/templates/crds/experiment-crd.yaml +++ b/charts/argo-rollouts/templates/crds/experiment-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - exp singular: experiment + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: diff --git a/charts/argo-rollouts/templates/crds/rollout-crd.yaml b/charts/argo-rollouts/templates/crds/rollout-crd.yaml index 01eaccac..888ca599 100644 --- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml +++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - ro singular: rollout + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: From e39ccfe31585a9843ac64cbdc0706e098e992df4 Mon Sep 17 00:00:00 2001 From: cskh Date: Fri, 7 May 2021 13:29:36 -0400 Subject: [PATCH 12/19] feat: add resources to argo-rollouts deployment (#711) - add destinationrule to clusterrolebinding Signed-off-by: Hui Kang Co-authored-by: Hui Kang --- charts/argo-rollouts/Chart.yaml | 2 +- charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml | 1 + charts/argo-rollouts/templates/argo-rollouts-deployment.yaml | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index 99269837..84752bf3 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.10.2" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 0.5.1 +version: 0.5.2 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml index b9595710..c3fb9f0c 100644 --- a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml +++ b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml @@ -130,6 +130,7 @@ rules: - networking.istio.io resources: - virtualservices + - destinationrules verbs: - watch - get diff --git a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml index dd04516a..1c4342bf 100644 --- a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml +++ b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml @@ -38,6 +38,10 @@ spec: imagePullPolicy: {{ .Values.controller.image.pullPolicy }} name: {{ .Values.controller.name }} resources: +{{- toYaml .Values.controller.resources | nindent 10 }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + resources: {{- toYaml .Values.controller.resources | nindent 10 }} {{- if .Values.controller.nodeSelector }} nodeSelector: From 26b3d9167243291e98286fb09893db74c33439cd Mon Sep 17 00:00:00 2001 From: Alec Rajeev Date: Sun, 9 May 2021 15:55:53 -0400 Subject: [PATCH 13/19] chore(argo-events): update argo-events to 1.3.3 (#720) Signed-off-by: Alec Rajeev --- charts/argo-events/Chart.yaml | 4 ++-- charts/argo-events/values.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index c9f2ae12..5def36c7 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 1.3.3 +version: 1.4.0 keywords: - argo-events - sensor-controller @@ -12,6 +12,6 @@ sources: maintainers: - name: VaibhavPage - name: whynowy -appVersion: 1.2.3 +appVersion: 1.3.1 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index b786e260..a54ec010 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -45,7 +45,7 @@ singleNamespace: true sensorController: name: sensor-controller image: sensor-controller - tag: v1.2.3 + tag: v1.3.1 replicaCount: 1 sensorImage: sensor podAnnotations: {} @@ -58,7 +58,7 @@ sensorController: eventsourceController: name: eventsource-controller image: eventsource-controller - tag: v1.2.3 + tag: v1.3.1 replicaCount: 1 eventsourceImage: eventsource podAnnotations: {} @@ -71,7 +71,7 @@ eventsourceController: eventbusController: name: eventbus-controller image: eventbus-controller - tag: v1.2.3 + tag: v1.3.1 replicaCount: 1 podAnnotations: {} nodeSelector: {} From 19d019039c78fe7b60a1cb6f0649b8b9ac04b68b Mon Sep 17 00:00:00 2001 From: aniekgul Date: Sun, 9 May 2021 16:05:51 -0400 Subject: [PATCH 14/19] chore(argo-cd): upgrade redis-ha version to 4.12.14 (#710) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aniek Gul Co-authored-by: Oliver Bähler --- charts/argo-cd/Chart.lock | 6 +++--- charts/argo-cd/Chart.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.lock b/charts/argo-cd/Chart.lock index 497aa297..52941728 100644 --- a/charts/argo-cd/Chart.lock +++ b/charts/argo-cd/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: redis-ha repository: https://dandydeveloper.github.io/charts/ - version: 4.10.4 -digest: sha256:e36321520ffd6f91962b0bcfeae947a86983d6b6d273eb616f08425e2b8ab9c2 -generated: "2021-04-14T13:41:16.151666-07:00" + version: 4.12.14 +digest: sha256:34275a4f4df92c570d07b0553da5d1fa200b6f057f7091746c853fd7399ee30a +generated: "2021-05-03T16:02:41.4356045-04:00" diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 766578ef..584ef6e2 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.0 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.2.2 +version: 3.2.3 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: @@ -16,6 +16,6 @@ maintainers: - name: seanson dependencies: - name: redis-ha - version: 4.10.4 + version: 4.12.14 repository: https://dandydeveloper.github.io/charts/ condition: redis-ha.enabled From 6735d66f1ab58c82474f38e114092c3036cd82b1 Mon Sep 17 00:00:00 2001 From: sgavrylenko <13081190+sgavrylenko@users.noreply.github.com> Date: Tue, 11 May 2021 14:19:17 +0300 Subject: [PATCH 15/19] feat(argocd-notification): add context variable for templating purpose (#713) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add context variable for templating purpose Signed-off-by: Sergiy Gavrylenko Signed-off-by: Sergiy Gavrylenko * update version of argocd-notification chart Signed-off-by: Sergiy Gavrylenko Signed-off-by: Sergiy Gavrylenko * fix: spec.preserveUnknownFields must be set to false to allow upgrades from v1beta1 (#709) Signed-off-by: Jack Andersen Signed-off-by: Sergiy Gavrylenko * feat: add resources to argo-rollouts deployment (#711) - add destinationrule to clusterrolebinding Signed-off-by: Hui Kang Co-authored-by: Hui Kang Signed-off-by: Sergiy Gavrylenko * chore(argo-events): update argo-events to 1.3.3 (#720) Signed-off-by: Alec Rajeev Signed-off-by: Sergiy Gavrylenko * chore(argo-cd): upgrade redis-ha version to 4.12.14 (#710) Signed-off-by: Aniek Gul Co-authored-by: Oliver Bähler Signed-off-by: Sergiy Gavrylenko * Update charts/argocd-notifications/Chart.yaml Co-authored-by: Oliver Bähler Signed-off-by: Sergiy Gavrylenko * Update charts/argocd-notifications/templates/configmap.yaml Co-authored-by: Oliver Bähler Signed-off-by: Sergiy Gavrylenko Co-authored-by: Sergiy Gavrylenko Co-authored-by: jandersen-plaid <52045989+jandersen-plaid@users.noreply.github.com> Co-authored-by: cskh Co-authored-by: Hui Kang Co-authored-by: Alec Rajeev Co-authored-by: aniekgul Co-authored-by: Oliver Bähler --- charts/argocd-notifications/Chart.yaml | 2 +- charts/argocd-notifications/templates/configmap.yaml | 5 ++++- charts/argocd-notifications/values.yaml | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index 12c03d53..8a1e04d8 100644 --- a/charts/argocd-notifications/Chart.yaml +++ b/charts/argocd-notifications/Chart.yaml @@ -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.2.0 +version: 1.3.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argocd-notifications/templates/configmap.yaml b/charts/argocd-notifications/templates/configmap.yaml index 442234bc..37f95b53 100644 --- a/charts/argocd-notifications/templates/configmap.yaml +++ b/charts/argocd-notifications/templates/configmap.yaml @@ -8,6 +8,9 @@ metadata: data: context: | argocdUrl: {{ .Values.argocdUrl | quote }} + {{- with .Values.context }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.notifiers }} {{- toYaml . | nindent 2 }} {{- end }} @@ -21,4 +24,4 @@ data: {{- with .Values.triggers }} {{- toYaml . | nindent 2 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/argocd-notifications/values.yaml b/charts/argocd-notifications/values.yaml index ace4c84e..bfe746c3 100644 --- a/charts/argocd-notifications/values.yaml +++ b/charts/argocd-notifications/values.yaml @@ -19,6 +19,11 @@ nodeSelector: {} updateStrategy: type: Recreate +context: + # Add custom values into context + # region: east + # environmentName: staging + secret: # Whether helm chart creates controller secret create: true From a25cfd221cd8093cd79282413b2201c9a1e789d9 Mon Sep 17 00:00:00 2001 From: loreleimccollum-work <66749079+loreleimccollum-work@users.noreply.github.com> Date: Thu, 13 May 2021 01:36:13 -0400 Subject: [PATCH 16/19] feat: Support custom rules for the Application Controller Cluster Role (#730) * feat: Support custom rules for the Application Controller Cluster Role Signed-off-by: Lorelei McCollum * Add newline at end of file Signed-off-by: Lorelei McCollum --- CONTRIBUTING.md | 6 ++++++ charts/argo-cd/Chart.yaml | 2 +- .../argocd-application-controller/clusterrole.yaml | 6 +++++- charts/argo-cd/values.yaml | 7 +++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b64861bb..f4c7d89c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,6 +22,12 @@ helm delete argo-cd --purge kubectl delete crd -l app.kubernetes.io/part-of=argocd ``` +Pre-requisites: +``` +helm repo add redis-ha https://dandydeveloper.github.io/charts/ +helm dependency update +``` + Minimally: ``` diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 584ef6e2..07d6fb7b 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.0 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.2.3 +version: 3.2.4 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml index 3426c9c8..bd6ff8aa 100644 --- a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml @@ -6,6 +6,9 @@ metadata: labels: {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }} rules: +{{- if .Values.controller.clusterRoleRules.enabled }} +{{- toYaml .Values.controller.clusterRoleRules.rules | nindent 2 }} +{{ else }} - apiGroups: - '*' resources: @@ -16,4 +19,5 @@ rules: - '*' verbs: - '*' -{{- end }} \ No newline at end of file +{{- end }} +{{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index dc04e3eb..ef68a320 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -183,6 +183,13 @@ controller: ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster. clusterAdminAccess: enabled: true + ## Enable Custom Rules for the Application Controller's Cluster Role resource + ## Enable this and set the rules: to whatever custom rules you want for the Cluster Role resource. + ## Defaults to off + clusterRoleRules: + enabled: false + rules: [] + ## Dex dex: From 331d3445d2b5abb37cbf24dc29d2af5fb475b8eb Mon Sep 17 00:00:00 2001 From: Marco Kilchhofer Date: Fri, 14 May 2021 21:04:24 +0200 Subject: [PATCH 17/19] chore: Nominate mkilchhofer as an approver (#714) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Oliver Bähler --- CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index bb890183..a3926889 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,5 +1,8 @@ # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners +# All charts +/charts/* @mkilchhofer + # Argo Workflows /charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler From 9548bffc6959f965b1edc259f1c29400c5f1e351 Mon Sep 17 00:00:00 2001 From: Aman Shah Date: Sun, 16 May 2021 18:18:39 +0530 Subject: [PATCH 18/19] chore(argo-cd): Bumped argo-cd to 2.0.1 (#732) Signed-off-by: aman chore(argo-cd): bumped chart version Signed-off-by: aman Co-authored-by: aman Co-authored-by: Marco Kilchhofer --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 07d6fb7b..e154e4b0 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 2.0.0 +appVersion: 2.0.1 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.2.4 +version: 3.2.5 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index ef68a320..f5bff3b4 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -10,7 +10,7 @@ installCRDs: true global: image: repository: quay.io/argoproj/argocd - tag: v2.0.0 + tag: v2.0.1 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 From 0919bbc11639499d240325265a84f7383b2b1c8b Mon Sep 17 00:00:00 2001 From: Marco Kilchhofer Date: Sun, 16 May 2021 14:57:24 +0200 Subject: [PATCH 19/19] feat(argo-ci): remove deprecated helm chart (#734) Signed-off-by: Marco Kilchhofer --- charts/argo-ci/.helmignore | 21 ----------- charts/argo-ci/Chart.yaml | 12 ------- charts/argo-ci/README.md | 5 --- charts/argo-ci/templates/NOTES.txt | 0 charts/argo-ci/templates/_helpers.tpl | 16 --------- charts/argo-ci/templates/ci-deployment.yaml | 39 --------------------- charts/argo-ci/templates/ci-service.yaml | 17 --------- charts/argo-ci/values.yaml | 14 -------- 8 files changed, 124 deletions(-) delete mode 100644 charts/argo-ci/.helmignore delete mode 100644 charts/argo-ci/Chart.yaml delete mode 100644 charts/argo-ci/README.md delete mode 100644 charts/argo-ci/templates/NOTES.txt delete mode 100644 charts/argo-ci/templates/_helpers.tpl delete mode 100644 charts/argo-ci/templates/ci-deployment.yaml delete mode 100644 charts/argo-ci/templates/ci-service.yaml delete mode 100644 charts/argo-ci/values.yaml diff --git a/charts/argo-ci/.helmignore b/charts/argo-ci/.helmignore deleted file mode 100644 index f0c13194..00000000 --- a/charts/argo-ci/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/charts/argo-ci/Chart.yaml b/charts/argo-ci/Chart.yaml deleted file mode 100644 index c41334d9..00000000 --- a/charts/argo-ci/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -description: A Helm chart for Argo-CI -name: argo-ci -version: 1.0.0 -icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png -appVersion: v1.0.0-alpha2 -home: https://github.com/argoproj/argo-helm -deprecated: true -dependencies: - - name: argo - version: "^0.16.0" - repository: https://argoproj.github.io/argo-helm diff --git a/charts/argo-ci/README.md b/charts/argo-ci/README.md deleted file mode 100644 index 7eaa9039..00000000 --- a/charts/argo-ci/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Argo CI Chart - -**Deprecated** - Use [Argo-Events](./argo-events) instead. - -This is a **community maintained** chart. diff --git a/charts/argo-ci/templates/NOTES.txt b/charts/argo-ci/templates/NOTES.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/argo-ci/templates/_helpers.tpl b/charts/argo-ci/templates/_helpers.tpl deleted file mode 100644 index f0d83d2e..00000000 --- a/charts/argo-ci/templates/_helpers.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/charts/argo-ci/templates/ci-deployment.yaml b/charts/argo-ci/templates/ci-deployment.yaml deleted file mode 100644 index bf2e4121..00000000 --- a/charts/argo-ci/templates/ci-deployment.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Release.Name }}-ci - labels: - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - selector: - matchLabels: - app: {{ .Release.Name }}-ci - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ .Release.Name }}-ci - release: {{ .Release.Name }} - spec: - containers: - - name: ci - image: "{{ .Values.imageNamespace }}/{{ .Values.ciImage }}:{{ .Values.imageTag }}" - imagePullPolicy: {{ .Values.imagePullPolicy }} - env: - - name: IN_CLUSTER - value: "true" - - name: NAMESPACE - value: {{ .Values.workflowNamespace }} - - name: ARGO_CI_IMAGE - value: "{{ .Values.imageNamespace }}/{{ .Values.ciImage }}:{{ .Values.imageTag }}" - - name: CONTROLLER_INSTANCE_ID - value: {{ .Release.Name }} - ports: - - containerPort: 8001 - - containerPort: 8002 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/charts/argo-ci/templates/ci-service.yaml b/charts/argo-ci/templates/ci-service.yaml deleted file mode 100644 index 3c335c62..00000000 --- a/charts/argo-ci/templates/ci-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ .Release.Name }}-ci - labels: - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - - port: 80 - protocol: TCP - targetPort: 8001 - selector: - app: {{ .Release.Name }}-ci - sessionAffinity: None - type: LoadBalancer diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml deleted file mode 100644 index 86dadf98..00000000 --- a/charts/argo-ci/values.yaml +++ /dev/null @@ -1,14 +0,0 @@ -imageNamespace: argoproj -ciImage: argoci -imageTag: v1.0.0-alpha2 -imagePullPolicy: Always -# Secrets with credentials to pull images from a private registry -imagePullSecrets: [] -# - name: argo-pull-secret -workflowNamespace: default - -argo: - imagesNamespace: argoproj - installMinio: true - minioBucketName: argo-artifacts - useReleaseAsInstanceID: true