2.19.8

element-hq · Aug 6, 2024 · 5787853 · 5787853
1 parent 5ab300c
commit 5787853
Show file tree

Hide file tree

Showing 36 changed files with 14,370 additions and 10,699 deletions.
diff --git a/helm/ess-stack/Chart.yaml b/helm/ess-stack/Chart.yaml
@@ -7,5 +7,5 @@ apiVersion: v2
 name: ess-stack
 description: A Helm chart to deploy ESS stack
 type: application
-version: 2.19.7
-appVersion: 2.19.7
+version: 2.19.8
+appVersion: 2.19.8
diff --git a/helm/ess-stack/templates/_helpers.tpl b/helm/ess-stack/templates/_helpers.tpl
@@ -3,12 +3,15 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 
+
+
 {{/*
-Template the configuration of an ems image store from Helm values/secrets
+Create a default fully qualified app name.
 */}}
-{{- define "ess.secrets.credentials.ems-image-store" }}
-{{- with .Values.emsImageStore }}
-{{- printf "{\"auths\":{\"registry.element.io\":{\"auth\":\"%s\"}, \"gitlab-registry.matrix.org/ems-image-store\":{\"auth\":\"%s\"}}}" (printf "%s:%s" .username .password | b64enc) (printf "%s:%s" .username .password | b64enc) | b64enc }}
+{{- define "ess-stack.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- tpl .Values.fullnameOverride . | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{- end }}
-
diff --git a/helm/ess-stack/templates/elementdeployment.yaml b/helm/ess-stack/templates/elementdeployment.yaml
@@ -6,7 +6,7 @@
 apiVersion: matrix.element.io/v1alpha2
 kind: ElementDeployment
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "ess-stack.fullname" $ }}
   annotations:
     k8s.element.io/secretshash: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
 spec:

diff --git a/helm/ess-stack/templates/secrets.yaml b/helm/ess-stack/templates/secrets.yaml
@@ -11,7 +11,7 @@ metadata:
 type: Opaque
 data:
 {{ range $key, $value := $secret.content }}
-  {{ $key }}: {{ $value | b64enc }}
+  {{ $key }}: {{ (tpl $value $) | b64enc }}
 {{ end }}
 ---
 {{ end }}
diff --git a/helm/ess-stack/values.schema.json b/helm/ess-stack/values.schema.json
diff --git a/helm/ess-system/Chart.yaml b/helm/ess-system/Chart.yaml
@@ -7,12 +7,12 @@ apiVersion: v2
 name: ess-system
 description: A Helm chart to deploy ESS System prerequisites (operators & crds)
 type: application
-version: 2.19.7
-appVersion: 2.19.7
+version: 2.19.8
+appVersion: 2.19.8
 dependencies:
   - name: element-operator
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.19.7
+    version: 2.19.8
   - name: element-updater
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.19.7
+    version: 2.19.8
diff --git a/helm/ess-system/templates/_helpers.tpl b/helm/ess-system/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+# Copyright 2023-2024 New Vector Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+
+{{/*
+Create a default fully qualified app name.
+*/}}
+{{- define "ess-system.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- tpl .Values.fullnameOverride . | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
diff --git a/helm/ess-system/templates/selfsigned-issuer.yaml b/helm/ess-system/templates/selfsigned-issuer.yaml
@@ -6,32 +6,32 @@
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-  name: {{ .Release.Name }}-stack-ca
+  name: {{ include "ess-system.fullname" $ }}-stack-ca
 spec:
   selfSigned: {}
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ .Release.Name }}-stack-ca
+  name: {{ include "ess-system.fullname" $ }}-stack-ca
   namespace: cert-manager
 spec:
   isCA: true
-  commonName: {{ .Release.Name }}-stack-ca
-  secretName: {{ .Release.Name }}-stack-ca
+  commonName: {{ include "ess-system.fullname" $ }}-stack-ca
+  secretName: {{ include "ess-system.fullname" $ }}-stack-ca
   # 10 years
   duration: 87660h0m0s
   privateKey:
     algorithm: RSA
   issuerRef:
-    name: {{ .Release.Name }}-stack-ca
+    name: {{ include "ess-system.fullname" $ }}-stack-ca
     kind: ClusterIssuer
     group: cert-manager.io
 ---
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-  name: {{ .Release.Name }}-stack
+  name: {{ include "ess-system.fullname" $ }}-stack
 spec:
   ca:
-    secretName: {{ .Release.Name }}-stack-ca
+    secretName: {{ include "ess-system.fullname" $ }}-stack-ca
diff --git a/helm/ess-system/templates/webhook-certificate.yaml b/helm/ess-system/templates/webhook-certificate.yaml
@@ -6,13 +6,13 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ .Release.Name }}-{{ (index .Values "element-updater").namePrefix }}-conversion-webhook-tls
+  name: {{ include "ess-system.fullname" $ }}-{{ (index .Values "element-updater").namePrefix }}-conversion-webhook-tls
   namespace: {{ .Release.Namespace }}
 spec:
-  commonName: {{ .Release.Name }}-{{ (index .Values "element-updater").namePrefix }}-conversion-webhook.{{ .Release.Namespace }}.svc
+  commonName: {{ include "ess-system.fullname" $ }}-{{ (index .Values "element-updater").namePrefix }}-conversion-webhook.{{ .Release.Namespace }}.svc
   dnsNames:
-  - {{ .Release.Name }}-{{ (index .Values "element-updater").namePrefix }}-conversion-webhook.{{ .Release.Namespace }}.svc
-  secretName: {{ .Release.Name }}-{{ (index .Values "element-updater").namePrefix }}-selfsigned-certs
+  - {{ include "ess-system.fullname" $ }}-{{ (index .Values "element-updater").namePrefix }}-conversion-webhook.{{ .Release.Namespace }}.svc
+  secretName: {{ include "ess-system.fullname" $ }}-{{ (index .Values "element-updater").namePrefix }}-selfsigned-certs
   # 1 year
   duration: 8766h0m0s
   # 6 months
@@ -25,20 +25,20 @@ spec:
   - server auth
   - client auth
   issuerRef:
-    name: {{ .Release.Name }}-webhook
+    name: {{ include "ess-system.fullname" $ }}-webhook
     kind: Issuer
     group: cert-manager.io
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ .Release.Name }}-{{ (index .Values "element-operator").namePrefix }}-conversion-webhook-tls
+  name: {{ include "ess-system.fullname" $ }}-{{ (index .Values "element-operator").namePrefix }}-conversion-webhook-tls
   namespace: {{ .Release.Namespace }}
 spec:
-  commonName: {{ .Release.Name }}-{{ (index .Values "element-operator").namePrefix }}-conversion-webhook.{{ .Release.Namespace }}.svc
+  commonName: {{ include "ess-system.fullname" $ }}-{{ (index .Values "element-operator").namePrefix }}-conversion-webhook.{{ .Release.Namespace }}.svc
   dnsNames:
-  - {{ .Release.Name }}-{{ (index .Values "element-operator").namePrefix }}-conversion-webhook.{{ .Release.Namespace }}.svc
-  secretName: {{ .Release.Name }}-{{ (index .Values "element-operator").namePrefix }}-selfsigned-certs
+  - {{ include "ess-system.fullname" $ }}-{{ (index .Values "element-operator").namePrefix }}-conversion-webhook.{{ .Release.Namespace }}.svc
+  secretName: {{ include "ess-system.fullname" $ }}-{{ (index .Values "element-operator").namePrefix }}-selfsigned-certs
   # 1 year
   duration: 8766h0m0s
   # 6 months
@@ -51,6 +51,6 @@ spec:
   - server auth
   - client auth
   issuerRef:
-    name: {{ .Release.Name }}-webhook
+    name: {{ include "ess-system.fullname" $ }}-webhook
     kind: Issuer
     group: cert-manager.io
diff --git a/helm/ess-system/templates/webhook-issuer.yaml b/helm/ess-system/templates/webhook-issuer.yaml
@@ -6,34 +6,34 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: {{ .Release.Name }}-webhook-ca
+  name: {{ include "ess-system.fullname" $ }}-webhook-ca
   namespace: {{ .Release.Namespace }}
 spec:
   selfSigned: {}
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ .Release.Name }}-webhook-ca
+  name: {{ include "ess-system.fullname" $ }}-webhook-ca
   namespace: {{ .Release.Namespace }}
 spec:
   isCA: true
-  commonName: {{ .Release.Name }}-webhook-ca
-  secretName: {{ .Release.Name }}-webhook-ca
+  commonName: {{ include "ess-system.fullname" $ }}-webhook-ca
+  secretName: {{ include "ess-system.fullname" $ }}-webhook-ca
   # 10 years
   duration: 87660h0m0s
   privateKey:
     algorithm: RSA
   issuerRef:
-    name: {{ .Release.Name }}-webhook-ca
+    name: {{ include "ess-system.fullname" $ }}-webhook-ca
     kind: Issuer
     group: cert-manager.io
 ---
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: {{ .Release.Name }}-webhook
+  name: {{ include "ess-system.fullname" $ }}-webhook
   namespace: {{ .Release.Namespace }}
 spec:
   ca:
-    secretName: {{ .Release.Name }}-webhook-ca
+    secretName: {{ include "ess-system.fullname" $ }}-webhook-ca
diff --git a/helm/ess-system/values.yaml b/helm/ess-system/values.yaml
@@ -11,9 +11,11 @@ element-operator:
   crds:
     annotations:
       cert-manager.io/inject-ca-from: >-
-        {{ .Release.Namespace }}/{{ .Release.Name }}-{{ .Values.namePrefix }}-conversion-webhook-tls
+        {{ .Release.Namespace }}/{{ include "ess-system.fullname" $ }}-{{ .Values.namePrefix }}-conversion-webhook-tls
     conversionWebhook:
-      tlsSecretName: "{{ .Release.Name }}-operator-selfsigned-certs"
+      tlsSecretName: >-
+        {{ include "ess-system.fullname" $ }}-operator-selfsigned-certs
+  emsImageStore: {}
 
 element-updater:
   namePrefix: updater
@@ -22,6 +24,8 @@ element-updater:
   crds:
     annotations:
       cert-manager.io/inject-ca-from: >-
-        {{ .Release.Namespace }}/{{ .Release.Name }}-{{ .Values.namePrefix }}-conversion-webhook-tls
+        {{ .Release.Namespace }}/{{ include "ess-system.fullname" $ }}-{{ .Values.namePrefix }}-conversion-webhook-tls
     conversionWebhook:
-      tlsSecretName: "{{ .Release.Name }}-updater-selfsigned-certs"
+      tlsSecretName: >-
+        {{ include "ess-system.fullname" $ }}-updater-selfsigned-certs
+  emsImageStore: {}
diff --git a/helm/operator/Chart.yaml b/helm/operator/Chart.yaml
@@ -20,9 +20,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.19.7
+version: 2.19.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.19.7
+appVersion: 2.19.8
diff --git a/helm/operator/source-values.yaml b/helm/operator/source-values.yaml
@@ -34,7 +34,7 @@ crds:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-operator-conversion-webhook
-      tag: 2.19.7
+      tag: 2.19.8
 operator:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ operator:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-operator
-      tag: 2.19.7
+      tag: 2.19.8
   rbacProxy:
     resources:
       limits:

diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml
@@ -34,7 +34,7 @@ crds:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-operator-conversion-webhook
-      tag: 2.19.7
+      tag: 2.19.8
 operator:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ operator:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-operator
-      tag: 2.19.7
+      tag: 2.19.8
   rbacProxy:
     resources:
       limits:

diff --git a/helm/updater/Chart.yaml b/helm/updater/Chart.yaml
@@ -20,9 +20,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.19.7
+version: 2.19.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.19.7
+appVersion: 2.19.8
diff --git a/helm/updater/source-values.yaml b/helm/updater/source-values.yaml
@@ -34,7 +34,7 @@ crds:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-updater-conversion-webhook
-      tag: 2.19.7
+      tag: 2.19.8
 updater:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ updater:
             - ALL
     image:
       repository: docker.io/vectorim/ess-core-updater
-      tag: 2.19.7
+      tag: 2.19.8
   rbacProxy:
     resources:
       limits:

diff --git a/helm/updater/values.yaml b/helm/updater/values.yaml
@@ -34,7 +34,7 @@ crds:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-updater-conversion-webhook
-      tag: 2.19.7
+      tag: 2.19.8
 updater:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ updater:
             - ALL
     image:
       repository: docker.io/vectorim/ess-core-updater
-      tag: 2.19.7
+      tag: 2.19.8
   rbacProxy:
     resources:
       limits:

diff --git a/makefiles/starter-edition-core b/makefiles/starter-edition-core
@@ -11,7 +11,6 @@ all: buildah-build
 build-helm-charts:
 	cd helm/operator && BASE_CRD_KUSTOMIZE_TARGET=config/crd/cleanup/starter-core bash build.sh
 	cd helm/updater && ELEMENT_DEPLOYMENT_KUSTOMIZE_TARGET=config/crd/element-deployment/cleanup/starter-core bash build.sh
-	cd helm/ess-system && helm dep up
 
 .PHONY: build-crds
 build-crds: kustomize