From 1492575ee07aebdbdc22ff4d16da7455fe3e1b1e Mon Sep 17 00:00:00 2001 From: Greg Date: Fri, 20 May 2022 14:10:35 -0400 Subject: [PATCH] feat(argo-cd): Add support for external issuers in server Certificate resource (#1279) * Add cert-manager issuer group support for external issuers Signed-off-by: Greg Sidelinger * Bumping chart version and adding changelog Signed-off-by: Greg Sidelinger * Fixing documentation. Signed-off-by: Greg Sidelinger * Retrigger CI pipeline Signed-off-by: Greg Sidelinger * Making server.certificate.issuer.group optional Signed-off-by: Greg Sidelinger * Apply suggestions from code review Signed-off-by: Marco Kilchhofer * Apply suggestions from code review Signed-off-by: Marco Kilchhofer Co-authored-by: Greg Sidelinger Co-authored-by: Marco Kilchhofer --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 1 + charts/argo-cd/templates/argocd-server/certificate.yaml | 3 +++ charts/argo-cd/values.yaml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index d1f96578..b480d0d1 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.3.4 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 4.6.2 +version: 4.6.3 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,4 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Changed]: Update Argo CD to v2.3.4" + - "[Added]: Add support for external issuers in server Certificate resource" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index bb2bfd2c..00ac29b6 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -424,6 +424,7 @@ NAME: my-release | server.certificate.domain | string | `"argocd.example.com"` | Certificate primary domain (commonName) | | server.certificate.duration | string | `""` | The requested 'duration' (i.e. lifetime) of the Certificate. Value must be in units accepted by Go time.ParseDuration | | server.certificate.enabled | bool | `false` | Deploy a Certificate resource (requires cert-manager) | +| server.certificate.issuer.group | string | `""` | Certificate issuer group. Set if using an external issuer. Eg. `cert-manager.io` | | server.certificate.issuer.kind | string | `""` | Certificate issuer kind. Either `Issuer` or `ClusterIssuer` | | server.certificate.issuer.name | string | `""` | Certificate isser name. Eg. `letsencrypt` | | server.certificate.renewBefore | string | `""` | How long before the currently issued certificate's expiry cert-manager should renew the certificate. Value must be in units accepted by Go time.ParseDuration | diff --git a/charts/argo-cd/templates/argocd-server/certificate.yaml b/charts/argo-cd/templates/argocd-server/certificate.yaml index 50780560..80f89b03 100644 --- a/charts/argo-cd/templates/argocd-server/certificate.yaml +++ b/charts/argo-cd/templates/argocd-server/certificate.yaml @@ -26,6 +26,9 @@ spec: duration: {{ . | quote }} {{- end }} issuerRef: + {{- with .Values.server.certificate.issuer.group }} + group: {{ . | quote }} + {{- end }} kind: {{ .Values.server.certificate.issuer.kind | quote }} name: {{ .Values.server.certificate.issuer.name | quote }} {{- with .Values.server.certificate.renewBefore }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 652e912c..3e3fb234 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -952,6 +952,8 @@ server: # -- How long before the currently issued certificate's expiry cert-manager should renew the certificate. Value must be in units accepted by Go time.ParseDuration renewBefore: "" issuer: + # -- Certificate issuer group. Set if using an external issuer. Eg. `cert-manager.io` + group: "" # -- Certificate issuer kind. Either `Issuer` or `ClusterIssuer` kind: "" # -- Certificate isser name. Eg. `letsencrypt`