2.20.2

element-hq · Oct 16, 2024 · e625ef8 · e625ef8
1 parent 9c2a231
commit e625ef8
Show file tree

Hide file tree

Showing 26 changed files with 1,652 additions and 1,708 deletions.
diff --git a/helm/easy-setup/deploy.sh b/helm/easy-setup/deploy.sh
@@ -17,7 +17,7 @@ if [[ -z "$ESS_SYSTEM_CHART" ]]; then
   ESS_SYSTEM_CHART="ess-starter-edition-core/ess-system"
 fi
 
-helm --kube-context kind-easy-setup upgrade ess-system $ESS_SYSTEM_CHART --install --create-namespace --namespace ess-system --wait -f values.ess-crds.yaml --version 2.20.1
+helm --kube-context kind-easy-setup upgrade ess-system $ESS_SYSTEM_CHART --install --create-namespace --namespace ess-system --wait -f values.ess-crds.yaml --version 2.20.2
 helm --kube-context kind-easy-setup upgrade ess ./ess-meta --install --create-namespace --namespace ess --wait -f values.ess-stack.yaml $values_files_args
 
 

diff --git a/helm/easy-setup/ess-meta/Chart.yaml b/helm/easy-setup/ess-meta/Chart.yaml
@@ -7,15 +7,15 @@ apiVersion: v2
 name: ess-meta
 description: A Helm chart to deploy ESS easily
 type: application
-version: 2.20.1
-appVersion: "2.20.1"
+version: 2.20.2
+appVersion: "2.20.2"
 dependencies:
   - name: ess-stack
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.20.1
+    version: 2.20.2
   - name: ess-system
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.20.1
+    version: 2.20.2
   - name: postgresql
     version: 13.2.24
     repository: https://charts.bitnami.com/bitnami

diff --git a/helm/easy-setup/prepare.sh b/helm/easy-setup/prepare.sh
@@ -28,6 +28,7 @@ docker run \
 echo "now on kind context, going to apply whats next in 15seconds"
 sleep 5
 kubectl --context $kind_context_name apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
+kubectl patch configmap/ingress-nginx-controller -n ingress-nginx --type merge --patch-file tests/nginx-cm.yml
 helm --kube-context $kind_context_name install \
   cert-manager jetstack/cert-manager \
   --namespace cert-manager \

diff --git a/helm/easy-setup/tests/nginx-cm.yml b/helm/easy-setup/tests/nginx-cm.yml
@@ -0,0 +1,8 @@
+# Copyright 2024 New Vector Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+data:
+  # we need this for all our path prefixs with dots, like `.well-known  `
+  strict-validate-path-type: "false"
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.20.1
-appVersion: 2.20.1
+version: 2.20.2
+appVersion: 2.20.2
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.20.1
-appVersion: 2.20.1
+version: 2.20.2
+appVersion: 2.20.2
 dependencies:
   - name: element-operator
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.20.1
+    version: 2.20.2
   - name: element-updater
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.20.1
+    version: 2.20.2
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.20.1
+version: 2.20.2
 
 # 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.20.1
+appVersion: 2.20.2
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.20.1
+      tag: 2.20.2
 operator:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ operator:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-operator
-      tag: 2.20.1
+      tag: 2.20.2
   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.20.1
+      tag: 2.20.2
 operator:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ operator:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-operator
-      tag: 2.20.1
+      tag: 2.20.2
   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.20.1
+version: 2.20.2
 
 # 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.20.1
+appVersion: 2.20.2
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.20.1
+      tag: 2.20.2
 updater:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ updater:
             - ALL
     image:
       repository: docker.io/vectorim/ess-core-updater
-      tag: 2.20.1
+      tag: 2.20.2
   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.20.1
+      tag: 2.20.2
 updater:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ updater:
             - ALL
     image:
       repository: docker.io/vectorim/ess-core-updater
-      tag: 2.20.1
+      tag: 2.20.2
   rbacProxy:
     resources:
       limits:

diff --git a/roles/elementdeployment/defaults/main/images.yml b/roles/elementdeployment/defaults/main/images.yml
@@ -7,7 +7,7 @@ default_images_digests:
     element_web:
       image_repository_server: docker.io
       image_repository_path: vectorim/element-web
-      image_tag: v1.11.75
+      image_tag: v1.11.81
   kube_rbac_proxy:
     kube_rbac_proxy:
       image_repository_server: quay.io

diff --git a/sboms/docker.io_library_haproxy:3.0-alpine.json b/sboms/docker.io_library_haproxy:3.0-alpine.json
diff --git a/sboms/docker.io_library_nginx:1.26-alpine-slim.json b/sboms/docker.io_library_nginx:1.26-alpine-slim.json