diff --git a/charts/matrix-stack/ci/test-cluster-mixin.yaml b/charts/matrix-stack/ci/test-cluster-mixin.yaml index bae2b198..70ed26ce 100644 --- a/charts/matrix-stack/ci/test-cluster-mixin.yaml +++ b/charts/matrix-stack/ci/test-cluster-mixin.yaml @@ -6,5 +6,5 @@ # It is a mixin to be used with other values file to enable # usage of the test cluster -ingress: - tlsSecret: ess-selfsigned +certManager: + clusterIssuer: ess-selfsigned diff --git a/charts/matrix-stack/source/common/sub_schema_values.yaml.j2 b/charts/matrix-stack/source/common/sub_schema_values.yaml.j2 index f92bc8a2..42be6232 100644 --- a/charts/matrix-stack/source/common/sub_schema_values.yaml.j2 +++ b/charts/matrix-stack/source/common/sub_schema_values.yaml.j2 @@ -15,6 +15,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial matrixTools: {{ image(registry="ghcr.io", repository="element-hq/ess-helm/matrix-tools", tag="0.3.0") | indent(2) }} +## CertManager Issuer to configure by default automatically on all ingresses +## If configured, the chart will automatically generate the tlsSecret name for all ingresses +certManager: {} + ## Choose one of clusterIssuer or issuer + # clusterIssuer: + # issuer: + ## The server name of the Matrix Stack. This gets embedded in user IDs & room IDs ## It can not change after the initial deployment. # serverName: ess.localhost diff --git a/charts/matrix-stack/source/values.schema.json b/charts/matrix-stack/source/values.schema.json index 94f34aa5..dcc11018 100644 --- a/charts/matrix-stack/source/values.schema.json +++ b/charts/matrix-stack/source/values.schema.json @@ -12,6 +12,17 @@ "labels": { "$ref": "file://common/labels.json" }, + "certManager": { + "type": "object", + "properties": { + "clusterIssuer": { + "type": "string" + }, + "issuer": { + "type": "string" + } + } + }, "matrixTools": { "type": "object", "properties": { diff --git a/charts/matrix-stack/templates/element-web/ingress.yaml b/charts/matrix-stack/templates/element-web/ingress.yaml index ed2b1cba..b1fd21b5 100644 --- a/charts/matrix-stack/templates/element-web/ingress.yaml +++ b/charts/matrix-stack/templates/element-web/ingress.yaml @@ -8,13 +8,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial apiVersion: networking.k8s.io/v1 kind: Ingress metadata: -{{- include "element-io.ess-library.ingress.annotations" (dict "root" $ "context" .ingress.annotations) | nindent 2 }} +{{- include "element-io.ess-library.ingress.annotations" (dict "root" $ "context" .ingress) | nindent 2 }} labels: {{- include "element-io.element-web.labels" (dict "root" $ "context" .) | nindent 4 }} name: {{ $.Release.Name }}-element-web namespace: {{ $.Release.Namespace }} spec: -{{- include "element-io.ess-library.ingress.tlsSecret" (dict "root" $ "context" (dict "hosts" (list (required "elementWeb.ingress.host is required" .ingress.host)) "tlsSecret" .ingress.tlsSecret)) | nindent 2 }} +{{- include "element-io.ess-library.ingress.tlsSecret" (dict "root" $ "context" (dict "hosts" (list (required "elementWeb.ingress.host is required" .ingress.host)) "tlsSecret" .ingress.tlsSecret "ingressName" "element-web")) | nindent 2 }} {{- include "element-io.ess-library.ingress.className" (dict "root" $ "context" .ingress.className) | nindent 2 }} rules: - host: {{ (tpl .ingress.host $) | quote }} diff --git a/charts/matrix-stack/templates/ess-library/_ingress.tpl b/charts/matrix-stack/templates/ess-library/_ingress.tpl index 9fb38dc9..9f6f25a7 100644 --- a/charts/matrix-stack/templates/ess-library/_ingress.tpl +++ b/charts/matrix-stack/templates/ess-library/_ingress.tpl @@ -10,8 +10,19 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial {{- fail "element-io.ess-library.ingress.annotations missing context" -}} {{- end }} {{- $annotations := dict -}} +{{- $tlsSecret := coalesce .context.tlsSecret $root.Values.ingress.tlsSecret -}} +{{- if and (not $tlsSecret) $root.Values.certManager -}} +{{- with $root.Values.certManager -}} +{{- with .clusterIssuer -}} +{{- $annotations = merge $annotations (dict "cert-manager.io/cluster-issuer" .) -}} +{{- end -}} +{{- with .issuer -}} +{{- $annotations = merge $annotations (dict "cert-manager.io/issuer" .) -}} +{{- end -}} +{{- end -}} +{{- end -}} {{- $annotations = mustMergeOverwrite $annotations ($root.Values.ingress.annotations | deepCopy) -}} -{{- $annotations = mustMergeOverwrite $annotations (.context | deepCopy) -}} +{{- $annotations = mustMergeOverwrite $annotations (.context.annotations | deepCopy) -}} {{- with $annotations -}} annotations: {{- toYaml . | nindent 2 }} @@ -21,14 +32,16 @@ annotations: {{- define "element-io.ess-library.ingress.tlsSecret" -}} {{- $root := .root -}} {{- with required "element-io.ess-library.ingress.tlsSecret missing context" .context -}} +{{- $ingressName := required "element-io.ess-library.ingress.tlsSecret missing ingress name" .ingressName -}} {{- $hosts := .hosts -}} -{{- with coalesce .tlsSecret $root.Values.ingress.tlsSecret -}} +{{- $tlsSecret := coalesce .tlsSecret $root.Values.ingress.tlsSecret -}} +{{- if or $tlsSecret $root.Values.certManager -}} tls: - hosts: {{- range $host := $hosts }} - {{ (tpl $host $root) | quote }} {{- end }} - secretName: {{ (tpl . $root) | quote }} + secretName: {{ (tpl ($tlsSecret | default (printf "{{ .Release.Name }}-%s-certmanager-tls" $ingressName)) $root) | quote }} {{- end -}} {{- end -}} {{- end -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/ingress.yaml b/charts/matrix-stack/templates/matrix-authentication-service/ingress.yaml index 3e55903d..dbbb12a7 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/ingress.yaml +++ b/charts/matrix-stack/templates/matrix-authentication-service/ingress.yaml @@ -9,13 +9,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial apiVersion: networking.k8s.io/v1 kind: Ingress metadata: -{{- include "element-io.ess-library.ingress.annotations" (dict "root" $ "context" .ingress.annotations) | nindent 2 }} +{{- include "element-io.ess-library.ingress.annotations" (dict "root" $ "context" .ingress) | nindent 2 }} labels: {{- include "element-io.matrix-authentication-service.labels" (dict "root" $ "context" .) | nindent 4 }} name: {{ $.Release.Name }}-matrix-authentication-service namespace: {{ $.Release.Namespace }} spec: -{{- include "element-io.ess-library.ingress.tlsSecret" (dict "root" $ "context" (dict "hosts" (list (required "matrixAuthenticationService.ingress.host is required" .ingress.host)) "tlsSecret" .ingress.tlsSecret)) | nindent 2 }} +{{- include "element-io.ess-library.ingress.tlsSecret" (dict "root" $ "context" (dict "hosts" (list (required "matrixAuthenticationService.ingress.host is required" .ingress.host)) "tlsSecret" .ingress.tlsSecret "ingressName" "matrix-authentication-service")) | nindent 2 }} {{- include "element-io.ess-library.ingress.className" (dict "root" $ "context" .ingress.className) | nindent 2 }} rules: - host: {{ (tpl .ingress.host $) | quote }} diff --git a/charts/matrix-stack/templates/synapse/synapse_ingress.yaml b/charts/matrix-stack/templates/synapse/synapse_ingress.yaml index 4e20b336..7a272b45 100644 --- a/charts/matrix-stack/templates/synapse/synapse_ingress.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_ingress.yaml @@ -9,13 +9,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial apiVersion: networking.k8s.io/v1 kind: Ingress metadata: -{{- include "element-io.ess-library.ingress.annotations" (dict "root" $ "context" .ingress.annotations) | nindent 2 }} +{{- include "element-io.ess-library.ingress.annotations" (dict "root" $ "context" .ingress) | nindent 2 }} labels: {{- include "element-io.synapse-ingress.labels" (dict "root" $ "context" $.Values.haproxy) | nindent 4 }} name: {{ $.Release.Name }}-synapse namespace: {{ $.Release.Namespace }} spec: -{{- include "element-io.ess-library.ingress.tlsSecret" (dict "root" $ "context" (dict "hosts" (list (required "synapse.ingress.host is required" .ingress.host)) "tlsSecret" .ingress.tlsSecret)) | nindent 2 }} +{{- include "element-io.ess-library.ingress.tlsSecret" (dict "root" $ "context" (dict "hosts" (list (required "synapse.ingress.host is required" .ingress.host)) "tlsSecret" .ingress.tlsSecret "ingressName" "synapse")) | nindent 2 }} {{- include "element-io.ess-library.ingress.className" (dict "root" $ "context" .ingress.className) | nindent 2 }} rules: - host: {{ (tpl .ingress.host $) | quote }} diff --git a/charts/matrix-stack/templates/well-known/ingress.yaml b/charts/matrix-stack/templates/well-known/ingress.yaml index 443dfd2a..a0bf051d 100644 --- a/charts/matrix-stack/templates/well-known/ingress.yaml +++ b/charts/matrix-stack/templates/well-known/ingress.yaml @@ -9,13 +9,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial apiVersion: networking.k8s.io/v1 kind: Ingress metadata: -{{- include "element-io.ess-library.ingress.annotations" (dict "root" $ "context" .ingress.annotations) | nindent 2 }} +{{- include "element-io.ess-library.ingress.annotations" (dict "root" $ "context" .ingress) | nindent 2 }} labels: {{- include "element-io.well-known-delegation-ingress.labels" (dict "root" $ "context" $.Values.haproxy) | nindent 4 }} name: {{ $.Release.Name }}-well-known namespace: {{ $.Release.Namespace }} spec: -{{- include "element-io.ess-library.ingress.tlsSecret" (dict "root" $ "context" (dict "hosts" (list (.ingress.host | default $.Values.serverName)) "tlsSecret" .ingress.tlsSecret)) | nindent 2 }} +{{- include "element-io.ess-library.ingress.tlsSecret" (dict "root" $ "context" (dict "hosts" (list (.ingress.host | default $.Values.serverName)) "tlsSecret" .ingress.tlsSecret "ingressName" "well-known")) | nindent 2 }} {{- include "element-io.ess-library.ingress.className" (dict "root" $ "context" .ingress.className) | nindent 2 }} rules: - host: "{{ tpl ($.Values.wellKnownDelegation.ingress.host | default $.Values.serverName) $ }}" diff --git a/charts/matrix-stack/values.schema.json b/charts/matrix-stack/values.schema.json index 72173f51..5386743b 100644 --- a/charts/matrix-stack/values.schema.json +++ b/charts/matrix-stack/values.schema.json @@ -19,6 +19,18 @@ ] } }, + "certManager": { + "type": "object", + "properties": { + "clusterIssuer": { + "type": "string" + }, + "issuer": { + "type": "string" + } + }, + "additionalProperties": false + }, "matrixTools": { "type": "object", "properties": { diff --git a/charts/matrix-stack/values.yaml b/charts/matrix-stack/values.yaml index f0a5e743..3d837eb4 100644 --- a/charts/matrix-stack/values.yaml +++ b/charts/matrix-stack/values.yaml @@ -36,6 +36,13 @@ matrixTools: ## - name: dockerhub pullSecrets: [] +## CertManager Issuer to configure by default automatically on all ingresses +## If configured, the chart will automatically generate the tlsSecret name for all ingresses +certManager: {} + ## Choose one of clusterIssuer or issuer + # clusterIssuer: + # issuer: + ## The server name of the Matrix Stack. This gets embedded in user IDs & room IDs ## It can not change after the initial deployment. # serverName: ess.localhost diff --git a/newsfragments/217.added.md b/newsfragments/217.added.md new file mode 100644 index 00000000..580ef92c --- /dev/null +++ b/newsfragments/217.added.md @@ -0,0 +1 @@ +Add a value to automatically configure CertManager on all ingresses. diff --git a/scripts/setup_test_cluster.sh b/scripts/setup_test_cluster.sh index 4c5c9098..55f86869 100755 --- a/scripts/setup_test_cluster.sh +++ b/scripts/setup_test_cluster.sh @@ -120,24 +120,5 @@ metadata: pod-security.kubernetes.io/audit-version: ${server_version} pod-security.kubernetes.io/warn: restricted pod-security.kubernetes.io/warn-version: ${server_version} -EOF - cat <