From 18fa697c1a35662ee2519dd90fc131e7166c06e1 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 2 Feb 2021 12:25:24 -0500 Subject: [PATCH 1/2] chore: correct spelling mistakes (#563) Signed-off-by: Josh Soref --- .circleci/config.yml | 2 +- CONTRIBUTING.md | 2 +- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 8 ++++---- charts/argo/Chart.yaml | 2 +- charts/argo/values.yaml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f36d2c1..6c3306ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: # We just need an image with `helm` on it. Handily we know of one already. - image: quay.io/helmpack/chart-testing:v3.3.1 steps: - # install the additional keys needed to push to Github. Alex Collins owns these keys. + # install the additional keys needed to push to GitHub. Alex Collins owns these keys. - add_ssh_keys - run: git config --global user.email "nobody@circleci.com" - run: git config --global user.name "Circle CI Build" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 72303016..b64861bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,7 @@ Please ensure chart version changes adhere to semantic versioning standards: ## Testing Charts -As part of the Continous Intergration system we run Helm's [Chart Testing](https://github.com/helm/chart-testing) tool. +As part of the Continuous Integration system we run Helm's [Chart Testing](https://github.com/helm/chart-testing) tool. The checks for this tool are stricter than the standard Helm requirements, where fields normally considered optional like `maintainer` are required in the standard spec and must be valid GitHub usernames. diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 7c5b4cf1..24e20051 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.7.11 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.11.6 +version: 2.11.7 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 cebd0923..411692ef 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -20,7 +20,7 @@ The application controller is now available as a `StatefulSet` when the `control ### 1.8.7 to 2.x.x -`controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs` are now arrays of strings intead of a map +`controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs` are now arrays of strings instead of a map What was ```yaml @@ -54,11 +54,11 @@ NAME: my-release ... ``` -### Helm v3 Compatability +### Helm v3 Compatibility Requires chart version 1.5.2 or newer. -Helm v3 has removed the `install-crds` hook so CRDs are now populated by files in the [crds](./crds) directory. Users of Helm v3 should set the `installCRDs` value to `false` to avoid warnings about nonexistant webhooks. +Helm v3 has removed the `install-crds` hook so CRDs are now populated by files in the [crds](./crds) directory. Users of Helm v3 should set the `installCRDs` value to `false` to avoid warnings about nonexistent webhooks. ## Chart Values @@ -129,7 +129,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | controller.service.annotations | Controller service annotations. | `{}` | | controller.service.labels | Controller service labels. | `{}` | | controller.service.port | Controller service port. | `8082` | -| controler.serviceAccount.annotations | Controller service account annotations | `{}` | +| controller.serviceAccount.annotations | Controller service account annotations | `{}` | | controller.serviceAccount.create | Create a service account for the controller | `true` | | controller.serviceAccount.name | Service account name. | `"argocd-application-controller"` | | controller.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` | diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index ee83daf9..4582dd29 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.15.3 +version: 0.15.4 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 a15938db..75642af8 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -249,7 +249,7 @@ server: enableEditing: true sso: ## SSO configuration when SSO is specified as a server auth mode. - ## All the values are requied. SSO is activated by adding --auth-mode=sso + ## All the values are required. SSO is activated by adding --auth-mode=sso ## to the server command line. # ## The root URL of the OIDC identity provider. From dee9f7de628a3423b587599933f621b014cde2d8 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Wed, 3 Feb 2021 07:51:58 -0600 Subject: [PATCH 2/2] feat(argo-cd): enable support for lifecycle hooks on ArgoCD Server (#547) Signed-off-by: Leonardo Murillo --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 1 + charts/argo-cd/templates/argocd-server/deployment.yaml | 4 ++++ charts/argo-cd/values.yaml | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 24e20051..3d447531 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.7.11 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.11.7 +version: 2.12.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/argo-cd/README.md b/charts/argo-cd/README.md index 411692ef..fb6db560 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -224,6 +224,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | server.ingressGrpc.tls | Ingress TLS configuration for dedicated [gRPC-ingress] | `[]` | | server.route.enabled | Enable a OpenShift route for the server | `false` | | server.route.hostname | Hostname of OpenShift route | `""` | +| server.lifecycle | PostStart and PreStop hooks configuration | `{}` | | server.livenessProbe.failureThreshold | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `3` | | server.livenessProbe.initialDelaySeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `10` | | server.livenessProbe.periodSeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `10` | diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index aeec1579..471949e4 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -120,6 +120,10 @@ spec: failureThreshold: {{ .Values.server.readinessProbe.failureThreshold }} resources: {{- toYaml .Values.server.resources | nindent 10 }} + {{- if .Values.server.lifecycle }} + lifecycle: +{{- toYaml .Values.server.lifecycle | nindent 10 }} + {{- end }} {{- if .Values.server.extraContainers }} {{- toYaml .Values.server.extraContainers | nindent 6 }} {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 0e68c9a7..7e8d00f3 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -366,6 +366,10 @@ server: ## env: [] + ## Specify postStart and preStop lifecycle hooks for your argo-cd-server container + ## + lifecycle: {} + ## Argo server log format: text|json logFormat: text ## Argo server log level