Merge branch 'main' into event-format

helm/dendrite/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: dendrite
-version: "0.13.2"
+version: "0.13.3"
 appVersion: "0.13.2"
 description: Dendrite Matrix Homeserver
 type: application

helm/dendrite/templates/deployment.yaml

@@ -26,13 +26,6 @@ spec:
       annotations:
         confighash: secret-{{ .Values.dendrite_config | toYaml | sha256sum | trunc 32 }}
     spec:
-      strategy:
-        type: {{ $.Values.strategy.type }}
-        {{- if eq $.Values.strategy.type "RollingUpdate" }}
-        rollingUpdate:
-          maxSurge: {{ $.Values.strategy.rollingUpdate.maxSurge }}
-          maxUnavailable: {{ $.Values.strategy.rollingUpdate.maxUnavailable }}
-        {{- end }}
       volumes:
       - name: {{ include "dendrite.fullname" . }}-conf-vol
         secret:
@@ -116,4 +109,4 @@ spec:
           failureThreshold: 10
           httpGet:
             path: /_dendrite/monitor/up
-            port: http
+            port: http

helm/dendrite/templates/ingress.yaml

@@ -1,8 +1,8 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "dendrite.fullname" . -}}
 {{- $serverNameHost := .Values.dendrite_config.global.server_name -}}
-{{- $wellKnownServerHost := default $serverNameHost (regexFind "^[^:]+" .Values.dendrite_config.global.well_known_server_name) -}}
-{{- $wellKnownClientHost := default $serverNameHost (regexFind "^[^:]+" .Values.dendrite_config.global.well_known_client_name) -}}
+{{- $wellKnownServerHost := default $serverNameHost (regexFind "^(\\[.+\\])?[^:]*" .Values.dendrite_config.global.well_known_server_name) -}}
+{{- $wellKnownClientHost := default $serverNameHost (regexFind "//(\\[.+\\])?[^:/]*" .Values.dendrite_config.global.well_known_client_name | trimAll "/") -}}
 {{- $allHosts := list $serverNameHost $wellKnownServerHost $wellKnownClientHost | uniq -}}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1

helm/dendrite/values.yaml

@@ -65,16 +65,6 @@ extraVolumeMounts: []
 # - mountPath: /etc/dendrite/extra-config
 #   name: extra-config
 
-strategy:
-  # -- Strategy to use for rolling updates (e.g. Recreate, RollingUpdate)
-  # If you are using ReadWriteOnce volumes, you should probably use Recreate
-  type: RollingUpdate
-  rollingUpdate:
-    # -- Maximum number of pods that can be unavailable during the update process
-    maxUnavailable: 25%
-    # -- Maximum number of pods that can be scheduled above the desired number of pods
-    maxSurge: 25%
-
 strategy:
   # -- Strategy to use for rolling updates (e.g. Recreate, RollingUpdate)
   # If you are using ReadWriteOnce volumes, you should probably use Recreate