diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index c182ffa2..78a0fd51 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -59,6 +59,7 @@ $ helm install --name my-release argo/argo-cd | ingress.additionalHosts | list | `[]` | Ingress additional hosts | | ingress.annotations | object | `{}` | Annotations for ingress object, set `nginx.ingress.kubernetes.io/force-ssl-redirect: "true"` and `nginx.ingress.kubernetes.io/ssl-passthrough: "true"` if serving GRPC and HTTPS on the same ingress | | ingress.enabled | bool | `false` | Enable ingress | +| ingress.tls | object | `{}` | Ingress TLS configuration | | rbac.policyCsv | string | `nil` | RBAC policy in CSV, see [values.yaml](./values.yaml) for format | | rbac.policyDefault | string | `nil` | The default role Argo CD will fall back to, when authorizing API requests, ie: `role:readonly` | | rbac.scopes | string | `nil` | Scopes controls which OIDC scopes to examine during rbac enforcement (in addition to `sub` scope). ie: `[groups]` | diff --git a/charts/argo-cd/templates/argocd-server-ingress.yaml b/charts/argo-cd/templates/argocd-server-ingress.yaml index 283d65f2..1649ea85 100644 --- a/charts/argo-cd/templates/argocd-server-ingress.yaml +++ b/charts/argo-cd/templates/argocd-server-ingress.yaml @@ -5,7 +5,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: argocd-server - labels: + labels: app.kubernetes.io/name: {{ include "argo-cd.name" . }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -26,4 +26,8 @@ spec: serviceName: argocd-server servicePort: https {{- end }} + {{- if .Values.ingress.tls }} + tls: +{{ toYaml .Values.ingress.tls | indent 4 }} + {{- end -}} {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index fcac647e..77de1876 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -65,6 +65,11 @@ ingress: # nginx.ingress.kubernetes.io/ssl-passthrough: "true" path: / additionalHosts: [] + tls: + # Secrets must be manually created in the namespace. + # - secretName: chart-example-tls + # hosts: + # - chart-example.local certificate: enabled: false