2.20.1

element-hq · Oct 8, 2024 · 9c2a231 · 9c2a231
1 parent d7e792b
commit 9c2a231
Show file tree

Hide file tree

Showing 78 changed files with 13,243 additions and 15,571 deletions.
diff --git a/config/crd/bases/starter-core/matrix.element.io_matrixcontentscanners.yaml b/config/crd/bases/starter-core/matrix.element.io_matrixcontentscanners.yaml
@@ -72,9 +72,10 @@ spec:
                       description: ClamAntiVirus configuration
                       properties:
                         replicas:
-                          description: The number of replicas for ClamAV. Defaults to 2
+                          description: The number of replicas for ClamAV. Can only be 1 for now
                           type: integer
-                          default: 2
+                          maximum: 1
+                          default: 1
                           minimum: 1
                         resources:
                           description: This field will be generated by kustomize

diff --git a/config/crd/element-deployment/cleanup/starter-core/kustomization.yaml b/config/crd/element-deployment/cleanup/starter-core/kustomization.yaml
@@ -55,11 +55,6 @@ patches:
     metadata:
       name: k8s-monitoring
     $patch: delete
-  - |-
-    kind: KustomizeSchema
-    metadata:
-      name: k8s-services
-    $patch: delete
   - |-
     kind: KustomizeSchema
     metadata:

diff --git a/config/crd/element-deployment/inline-patches/starter-core/replicas.yaml b/config/crd/element-deployment/inline-patches/starter-core/replicas.yaml
@@ -13,8 +13,10 @@
   path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/matrixContentScanner/properties/k8s/properties/clamAntiVirus/properties/workloads/properties/replicas'
   value:
     type: number
-    description: The number of ClamAV replicas
+    description: The number of ClamAV replicas. Can only be 1 for now
     minimum: 1
+    default: 1
+    maximum: 1
 - op: add
   path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/matrixContentScanner/properties/k8s/properties/matrixContentScanner/properties/workloads/properties/replicas'
   value:

diff --git a/config/crd/element-deployment/inline-patches/starter-core/storage-defaults.yaml b/config/crd/element-deployment/inline-patches/starter-core/storage-defaults.yaml
@@ -9,7 +9,11 @@
 - op: replace
   path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/matrixContentScanner/properties/k8s/properties/clamAntiVirus/properties/storage/properties/volume/default/size'
   value: 1Gi
+# We have both these defaults as specifying a storageClassName or selector shouldn't lose the default on the siz\e
 - op: replace
   path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/matrixContentScanner/properties/k8s/properties/matrixContentScanner/properties/storage/default/size'
   value: 10Gi
+- op: replace
+  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/matrixContentScanner/properties/k8s/properties/matrixContentScanner/properties/storage/properties/size/default'
+  value: 10Gi
 # Synapse defaults are configured in config/crd/element-deployment/replacements/starter-core/synapse.yaml
diff --git a/config/crd/element-deployment/replacements/starter-core/k8s-services.yaml b/config/crd/element-deployment/replacements/starter-core/k8s-services.yaml
diff --git a/config/crd/element-deployment/replacements/starter-core/k8s-storage-pvc-template.yaml b/config/crd/element-deployment/replacements/starter-core/k8s-storage-pvc-template.yaml
@@ -14,6 +14,7 @@ spec:
       size: This field will be replaced by kustomize
     properties:
       size:
+        default: This field will be replaced by kustomize
         anyOf:
           - type: integer
           - type: string

diff --git a/config/crd/element-deployment/replacements/starter-core/kustomization.yaml b/config/crd/element-deployment/replacements/starter-core/kustomization.yaml
@@ -15,7 +15,6 @@ resources:
   - well_known_delegation.yaml
   - global.yaml
   - k8s-common.yaml
-  - k8s-services.yaml
   - k8s-ingresses.yaml
   - k8s-monitoring.yaml
   - k8s-storage-pvc-template.yaml

diff --git a/config/crd/replacements/common/persistent-volume-claim-template.yaml b/config/crd/replacements/common/persistent-volume-claim-template.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 New Vector Ltd
+# Copyright 2023-2024 New Vector Ltd
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -10,6 +10,8 @@ spec:
   schema:
     description: Configure the PVC Templates
     type: object
+    required:
+      - size
     properties:
       size:
         anyOf:

diff --git a/config/crd/replacements/starter-core/kustomization.yaml b/config/crd/replacements/starter-core/kustomization.yaml
@@ -149,8 +149,6 @@ replacements:
           kind: CustomResourceDefinition
         reject:
           - namespace: enterprise
-          - kind: CustomResourceDefinition
-            name: lowbandwidths.matrix.element.io
         fieldPaths:
           - spec.versions.0.schema.openAPIV3Schema.properties.spec.properties.service
   - source:

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
+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 ./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.0
-appVersion: "2.20.0"
+version: 2.20.1
+appVersion: "2.20.1"
 dependencies:
   - name: ess-stack
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.20.0
+    version: 2.20.1
   - name: ess-system
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.20.0
+    version: 2.20.1
   - name: postgresql
     version: 13.2.24
     repository: https://charts.bitnami.com/bitnami

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.0
-appVersion: 2.20.0
+version: 2.20.1
+appVersion: 2.20.1
diff --git a/helm/ess-stack/values.schema.json b/helm/ess-stack/values.schema.json
@@ -592,7 +592,9 @@
                           "type": "object"
                         },
                         "replicas": {
-                          "description": "The number of ClamAV replicas",
+                          "default": 1,
+                          "description": "The number of ClamAV replicas. Can only be 1 for now",
+                          "maximum": 1,
                           "minimum": 1,
                           "type": "number"
                         },
@@ -1024,6 +1026,7 @@
                               "type": "string"
                             }
                           ],
+                          "default": "10Gi",
                           "description": "The volume size to use to store the media",
                           "x-kubernetes-int-or-string": true
                         },

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.0
-appVersion: 2.20.0
+version: 2.20.1
+appVersion: 2.20.1
 dependencies:
   - name: element-operator
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.20.0
+    version: 2.20.1
   - name: element-updater
     repository: https://element-hq.github.io/ess-starter-edition-core
-    version: 2.20.0
+    version: 2.20.1
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.0
+version: 2.20.1
 
 # 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.0
+appVersion: 2.20.1
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.0
+      tag: 2.20.1
 operator:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ operator:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-operator
-      tag: 2.20.0
+      tag: 2.20.1
   rbacProxy:
     resources:
       limits:

diff --git a/.../operator/templates/customresourcedefinition-matrixcontentscanners.matrix.element.io.yaml b/.../operator/templates/customresourcedefinition-matrixcontentscanners.matrix.element.io.yaml
@@ -94,6 +94,8 @@ spec:
                             storageClassName:
                               description: The storage class name to use
                               type: string
+                          required:
+                            - size
                           type: object
                         ttl:
                           description: The maximum amount of time an entry will stay in the cache before being evicted.
@@ -236,8 +238,9 @@ spec:
                               type: array
                           type: object
                         replicas:
-                          default: 2
-                          description: The number of replicas for ClamAV. Defaults to 2
+                          default: 1
+                          description: The number of replicas for ClamAV. Can only be 1 for now
+                          maximum: 1
                           minimum: 1
                           type: integer
                         resources:

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.0
+      tag: 2.20.1
 operator:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ operator:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-core-operator
-      tag: 2.20.0
+      tag: 2.20.1
   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.0
+version: 2.20.1
 
 # 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.0
+appVersion: 2.20.1
diff --git a/helm/updater/fragments/Deployment-element-updater-controller-manager.yaml b/helm/updater/fragments/Deployment-element-updater-controller-manager.yaml
@@ -137,7 +137,7 @@ spec:
           periodSeconds: 10
           initialDelaySeconds: 5
         ports:
-        - name: metrics-ctrl
+        - name: metrics
           containerPort: 8080
           protocol: TCP
         name: manager

diff --git a/helm/updater/fragments/Updater-Service.yaml b/helm/updater/fragments/Updater-Service.yaml
@@ -17,7 +17,7 @@ spec:
     - port: 8080
       protocol: TCP
       targetPort: 8080
-      name: metrics-controller
+      name: metrics
     - port: 8090
       protocol: TCP
       targetPort: 8090

diff --git a/helm/updater/fragments/Updater-ServiceMonitor.yaml b/helm/updater/fragments/Updater-ServiceMonitor.yaml
@@ -17,7 +17,7 @@ metadata:
 spec:
   endpoints:
   - interval: 30s
-    port: metrics-ctrl
+    port: metrics
   - interval: 30s
     port: metrics-watch
   selector:

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.0
+      tag: 2.20.1
 updater:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ updater:
             - ALL
     image:
       repository: docker.io/vectorim/ess-core-updater
-      tag: 2.20.0
+      tag: 2.20.1
   rbacProxy:
     resources:
       limits:

diff --git a/helm/updater/templates/customresourcedefinition-elementdeployment.yaml b/helm/updater/templates/customresourcedefinition-elementdeployment.yaml
@@ -462,7 +462,9 @@ spec:
                                       description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
                                       type: object
                                     replicas:
-                                      description: The number of ClamAV replicas
+                                      default: 1
+                                      description: The number of ClamAV replicas. Can only be 1 for now
+                                      maximum: 1
                                       minimum: 1
                                       type: number
                                     resources:
@@ -768,6 +770,7 @@ spec:
                                       anyOf:
                                         - type: integer
                                         - type: string
+                                      default: 10Gi
                                       description: The volume size to use to store the media
                                       pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[MGTPE])?$
                                       x-kubernetes-int-or-string: true
@@ -2775,7 +2778,9 @@ spec:
                                       description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
                                       type: object
                                     replicas:
-                                      description: The number of ClamAV replicas
+                                      default: 1
+                                      description: The number of ClamAV replicas. Can only be 1 for now
+                                      maximum: 1
                                       minimum: 1
                                       type: number
                                     resources:
@@ -3081,6 +3086,7 @@ spec:
                                       anyOf:
                                         - type: integer
                                         - type: string
+                                      default: 10Gi
                                       description: The volume size to use to store the media
                                       pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[MGTPE])?$
                                       x-kubernetes-int-or-string: true

diff --git a/helm/updater/templates/deployment-element-updater-controller-manager.yaml b/helm/updater/templates/deployment-element-updater-controller-manager.yaml
@@ -138,7 +138,7 @@ spec:
           periodSeconds: 10
           initialDelaySeconds: 5
         ports:
-        - name: metrics-ctrl
+        - name: metrics
           containerPort: 8080
           protocol: TCP
         name: manager

diff --git a/helm/updater/templates/service-manager-metrics.yaml b/helm/updater/templates/service-manager-metrics.yaml
@@ -18,7 +18,7 @@ spec:
     - port: 8080
       protocol: TCP
       targetPort: 8080
-      name: metrics-controller
+      name: metrics
     - port: 8090
       protocol: TCP
       targetPort: 8090

diff --git a/helm/updater/templates/service-monitor-manager.yaml b/helm/updater/templates/service-monitor-manager.yaml
@@ -17,7 +17,7 @@ metadata:
 spec:
   endpoints:
   - interval: 30s
-    port: metrics-ctrl
+    port: metrics
   - interval: 30s
     port: metrics-watch
   selector:

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.0
+      tag: 2.20.1
 updater:
   extraPodSpec:
     securityContext:
@@ -70,7 +70,7 @@ updater:
             - ALL
     image:
       repository: docker.io/vectorim/ess-core-updater
-      tag: 2.20.0
+      tag: 2.20.1
   rbacProxy:
     resources:
       limits: