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

feat(argo-cd): Add support for external issuers in server Certificate resource (#1279)

Browse source 
* Add cert-manager issuer group support for external issuers

Signed-off-by: Greg Sidelinger <sidelig@nationwide.com>

* Bumping chart version and adding changelog

Signed-off-by: Greg Sidelinger <sidelig@nationwide.com>

* Fixing documentation.

Signed-off-by: Greg Sidelinger <sidelig@nationwide.com>

* Retrigger CI pipeline

Signed-off-by: Greg Sidelinger <sidelig@nationwide.com>

* Making server.certificate.issuer.group optional

Signed-off-by: Greg Sidelinger <sidelig@nationwide.com>

* Apply suggestions from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Apply suggestions from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Greg Sidelinger <sidelig@nationwide.com>
Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Greg 2022-05-20 14:10:35 -04:00 committed by GitHub
parent 6967136f57
commit 1492575ee0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.3.4 appVersion: v2.3.4
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 4.6.2 version: 4.6.3
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
keywords: keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Changed]: Update Argo CD to v2.3.4" - "[Added]: Add support for external issuers in server Certificate resource"

1
charts/argo-cd/README.md
View file

@ -424,6 +424,7 @@ NAME: my-release
| server.certificate.domain | string | `"argocd.example.com"` | Certificate primary domain (commonName) | | 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.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.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.kind | string | `""` | Certificate issuer kind. Either `Issuer` or `ClusterIssuer` |
| server.certificate.issuer.name | string | `""` | Certificate isser name. Eg. `letsencrypt` | | 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 | | 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 |

3
charts/argo-cd/templates/argocd-server/certificate.yaml
View file

@ -26,6 +26,9 @@ spec:
duration: {{ . | quote }} duration: {{ . | quote }}
{{- end }} {{- end }}
issuerRef: issuerRef:
{{- with .Values.server.certificate.issuer.group }}
group: {{ . | quote }}
{{- end }}
kind: {{ .Values.server.certificate.issuer.kind | quote }} kind: {{ .Values.server.certificate.issuer.kind | quote }}
name: {{ .Values.server.certificate.issuer.name | quote }} name: {{ .Values.server.certificate.issuer.name | quote }}
{{- with .Values.server.certificate.renewBefore }} {{- with .Values.server.certificate.renewBefore }}

2
charts/argo-cd/values.yaml
View file

@ -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 # -- 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: "" renewBefore: ""
issuer: issuer:
# -- Certificate issuer group. Set if using an external issuer. Eg. `cert-manager.io`
group: ""
# -- Certificate issuer kind. Either `Issuer` or `ClusterIssuer` # -- Certificate issuer kind. Either `Issuer` or `ClusterIssuer`
kind: "" kind: ""
# -- Certificate isser name. Eg. `letsencrypt` # -- Certificate isser name. Eg. `letsencrypt`