2.12.17

element-hq · Jan 12, 2024 · 3cf287e · 3cf287e
1 parent 058f2f7
commit 3cf287e
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 61 deletions.
diff --git a/config/crd/default-resources/starter-core/default-resources.yaml b/config/crd/default-resources/starter-core/default-resources.yaml
@@ -11,62 +11,62 @@ spec:
       limits:
         memory: 200Mi
       requests:
-        cpu: 100m
+        cpu: 50m
         memory: 50Mi
     matrixContentScanner:
       icap:
         limits:
           memory: 1Gi
         requests:
           cpu: 100m
-          memory: 200Mi
+          memory: 100Mi
       clamAntiVirus:
         limits:
           memory: 4Gi
         requests:
           cpu: 100m
-          memory: 200Mi
+          memory: 100Mi
       matrixContentScanner:
         limits:
           memory: 500Mi
         requests:
           cpu: 100m
-          memory: 200Mi
+          memory: 100Mi
     slidingSync:
       api:
         limits:
           memory: 4Gi
         requests:
-          cpu: 200m
-          memory: 2Gi
+          cpu: 100m
+          memory: 200Mi
     synapse:
       haproxy:
         limits:
           memory: 200Mi
         requests:
-          cpu: 1
+          cpu: 100m
           memory: 100Mi
       redis:
         limits:
           memory: 50Mi
         requests:
-          cpu: 200m
+          cpu: 50m
           memory: 50Mi
       synapse:
         limits:
           memory: 4Gi
         requests:
-          cpu: 1
-          memory: 2Gi
+          cpu: 100m
+          memory: 100Mi
       workers:
         limits:
           memory: 4Gi
         requests:
-          cpu: 1
-          memory: 2Gi
+          cpu: 100m
+          memory: 100Mi
     wellKnownDelegation:
       limits:
         memory: 200Mi
       requests:
-        cpu: 100m
+        cpu: 50m
         memory: 50Mi
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.12.16
+version: 2.12.17
 
 # 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.12.16
+appVersion: 2.12.17
diff --git a/helm/operator/templates/customresourcedefinition-elementwebs.matrix.element.io.yaml b/helm/operator/templates/customresourcedefinition-elementwebs.matrix.element.io.yaml
@@ -159,7 +159,7 @@ spec:
                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                             x-kubernetes-int-or-string: true
                           default:
-                            cpu: 100m
+                            cpu: 50m
                             memory: 50Mi
                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                           type: object

diff --git a/.../operator/templates/customresourcedefinition-matrixcontentscanners.matrix.element.io.yaml b/.../operator/templates/customresourcedefinition-matrixcontentscanners.matrix.element.io.yaml
@@ -246,7 +246,7 @@ spec:
                                 x-kubernetes-int-or-string: true
                               default:
                                 cpu: 100m
-                                memory: 200Mi
+                                memory: 100Mi
                               description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                               type: object
                           type: object
@@ -350,7 +350,7 @@ spec:
                                 x-kubernetes-int-or-string: true
                               default:
                                 cpu: 100m
-                                memory: 200Mi
+                                memory: 100Mi
                               description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                               type: object
                           type: object
@@ -503,7 +503,7 @@ spec:
                                 x-kubernetes-int-or-string: true
                               default:
                                 cpu: 100m
-                                memory: 200Mi
+                                memory: 100Mi
                               description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                               type: object
                           type: object

diff --git a/helm/operator/templates/customresourcedefinition-slidingsyncs.matrix.element.io.yaml b/helm/operator/templates/customresourcedefinition-slidingsyncs.matrix.element.io.yaml
@@ -144,8 +144,8 @@ spec:
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
                               default:
-                                cpu: 200m
-                                memory: 2Gi
+                                cpu: 100m
+                                memory: 200Mi
                               description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                               type: object
                           type: object

diff --git a/helm/operator/templates/customresourcedefinition-synapses.matrix.element.io.yaml b/helm/operator/templates/customresourcedefinition-synapses.matrix.element.io.yaml
@@ -236,7 +236,7 @@ spec:
                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                             x-kubernetes-int-or-string: true
                           default:
-                            cpu: 1
+                            cpu: 100m
                             memory: 100Mi
                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                           type: object
@@ -446,7 +446,7 @@ spec:
                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                             x-kubernetes-int-or-string: true
                           default:
-                            cpu: 200m
+                            cpu: 50m
                             memory: 50Mi
                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                           type: object
@@ -474,8 +474,8 @@ spec:
                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                             x-kubernetes-int-or-string: true
                           default:
-                            cpu: 1
-                            memory: 2Gi
+                            cpu: 100m
+                            memory: 100Mi
                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                           type: object
                       type: object
@@ -513,8 +513,8 @@ spec:
                                   pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                   x-kubernetes-int-or-string: true
                                 default:
-                                  cpu: 1
-                                  memory: 2Gi
+                                  cpu: 100m
+                                  memory: 100Mi
                                 description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                 type: object
                             type: object

diff --git a/helm/operator/templates/customresourcedefinition-wellknowndelegations.matrix.element.io.yaml b/helm/operator/templates/customresourcedefinition-wellknowndelegations.matrix.element.io.yaml
@@ -166,7 +166,7 @@ spec:
                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                             x-kubernetes-int-or-string: true
                           default:
-                            cpu: 100m
+                            cpu: 50m
                             memory: 50Mi
                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                           type: object

diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml
@@ -31,7 +31,7 @@ operator:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-starter-edition-core-operator
-      tag: 2.12.16
+      tag: 2.12.17
 
   rbacProxy:
     resources:

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.12.16
+version: 2.12.17
 
 # 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.12.16
+appVersion: 2.12.17
diff --git a/helm/updater/templates/customresourcedefinition-elementdeployment.yaml b/helm/updater/templates/customresourcedefinition-elementdeployment.yaml
@@ -227,7 +227,7 @@ spec:
                                         pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                         x-kubernetes-int-or-string: true
                                       default:
-                                        cpu: 100m
+                                        cpu: 50m
                                         memory: 50Mi
                                       description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                       type: object
@@ -428,7 +428,7 @@ spec:
                                             x-kubernetes-int-or-string: true
                                           default:
                                             cpu: 100m
-                                            memory: 200Mi
+                                            memory: 100Mi
                                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                           type: object
                                       type: object
@@ -540,7 +540,7 @@ spec:
                                             x-kubernetes-int-or-string: true
                                           default:
                                             cpu: 100m
-                                            memory: 200Mi
+                                            memory: 100Mi
                                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                           type: object
                                       type: object
@@ -712,7 +712,7 @@ spec:
                                             x-kubernetes-int-or-string: true
                                           default:
                                             cpu: 100m
-                                            memory: 200Mi
+                                            memory: 100Mi
                                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                           type: object
                                       type: object
@@ -914,8 +914,8 @@ spec:
                                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                             x-kubernetes-int-or-string: true
                                           default:
-                                            cpu: 200m
-                                            memory: 2Gi
+                                            cpu: 100m
+                                            memory: 200Mi
                                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                           type: object
                                       type: object
@@ -1235,8 +1235,8 @@ spec:
                                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                           x-kubernetes-int-or-string: true
                                         default:
-                                          cpu: 1
-                                          memory: 2Gi
+                                          cpu: 100m
+                                          memory: 100Mi
                                         description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                         type: object
                                     type: object
@@ -1357,7 +1357,7 @@ spec:
                                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                             x-kubernetes-int-or-string: true
                                           default:
-                                            cpu: 1
+                                            cpu: 100m
                                             memory: 100Mi
                                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                           type: object
@@ -1558,7 +1558,7 @@ spec:
                                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                             x-kubernetes-int-or-string: true
                                           default:
-                                            cpu: 200m
+                                            cpu: 50m
                                             memory: 50Mi
                                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                           type: object
@@ -1693,8 +1693,8 @@ spec:
                                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                             x-kubernetes-int-or-string: true
                                           default:
-                                            cpu: 1
-                                            memory: 2Gi
+                                            cpu: 100m
+                                            memory: 100Mi
                                           description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                           type: object
                                       type: object
@@ -1926,7 +1926,7 @@ spec:
                                         pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                         x-kubernetes-int-or-string: true
                                       default:
-                                        cpu: 100m
+                                        cpu: 50m
                                         memory: 50Mi
                                       description: 'Requests describes the minimum amount of compute resources required. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                       type: object

diff --git a/helm/updater/values.yaml b/helm/updater/values.yaml
@@ -31,7 +31,7 @@ updater:
         - ALL
     image:
       repository: docker.io/vectorim/ess-starter-edition-core-updater
-      tag: 2.12.16
+      tag: 2.12.17
 
   rbacProxy:
     resources: