2.20.0

README.md

@@ -59,11 +59,19 @@ For example using `easy-rsa` :
 ```
 easyrsa init-pki
 easyrsa --batch "--req-cn=ESS-CA`date +%s`" build-ca nopass
-easyrsa --subject-alt-name="DNS:element-operator-conversion-webhook.element-operator"\
-  --days=10000 \
+easyrsa --san="DNS:element-operator-conversion-webhook" \
+        --san="DNS:element-operator-conversion-webhook.element-operator" \
+        --san="DNS:element-operator-conversion-webhook.element-operator.svc" \
+        --san="DNS:element-operator-conversion-webhook.element-operator.svc.cluster" \
+        --san="DNS:element-operator-conversion-webhook.element-operator.svc.cluster.local" \
+        --days=10000 \
   build-server-full element-operator-conversion-webhook nopass
-easyrsa --subject-alt-name="DNS:element-updater-conversion-webhook.element-updater"\
-  --days=10000 \
+easyrsa --san="DNS:element-updater-conversion-webhook" \
+        --san="DNS:element-updater-conversion-webhook.element-updater" \
+        --san="DNS:element-updater-conversion-webhook.element-updater.svc" \
+        --san="DNS:element-updater-conversion-webhook.element-updater.svc.cluster" \
+        --san="DNS:element-updater-conversion-webhook.element-updater.svc.cluster.local" \
+        --days=10000 \
   build-server-full element-updater-conversion-webhook nopass
 ```
 

config/crd/bases/starter-core/kustomization.yaml

@@ -6,6 +6,5 @@
 resources:
   - matrix.element.io_elementwebs.yaml
   - matrix.element.io_matrixcontentscanners.yaml
-  - matrix.element.io_slidingsyncs.yaml
   - matrix.element.io_synapses.yaml
   - matrix.element.io_wellknowndelegations.yaml

config/crd/bases/starter-core/matrix.element.io_synapses.yaml

@@ -218,6 +218,7 @@ spec:
                               - presence-writer
                               - pusher
                               - receipts-account
+                              - sliding-sync
                               - sso-login
                               - synchrotron
                               - typing-persister

config/crd/default-resources/starter-core/default-resources.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 New Vector Ltd
+# Copyright 2023-2024 New Vector Ltd
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -32,13 +32,6 @@ spec:
         requests:
           cpu: 100m
           memory: 100Mi
-    slidingSync:
-      api:
-        limits:
-          memory: 4Gi
-        requests:
-          cpu: 100m
-          memory: 200Mi
     synapse:
       haproxy:
         limits:

config/crd/element-deployment/base/common/matrix.element.io_elementdeployments.yaml

@@ -44,10 +44,13 @@ spec:
             spec:
               description: Spec defines the desired state of ElementDeployment
               type: object
+              required:
+                - global
               properties:
                 global:
                   type: object
-                  default: {}
+                  required:
+                    - config
                   properties:
                     k8s:
                       type: object

config/crd/element-deployment/base/starter-core/kustomization.yaml

@@ -16,10 +16,6 @@ patches:
     target:
       kind: CustomResourceDefinition
       name: elementdeployments.matrix.element.io
-  - path: sliding_sync.yaml
-    target:
-      kind: CustomResourceDefinition
-      name: elementdeployments.matrix.element.io
   - path: synapse.yaml
     target:
       kind: CustomResourceDefinition

config/crd/element-deployment/base/starter-core/matrix_content_scanner.yaml

@@ -32,8 +32,6 @@
             properties:
               workloads:
                 description: This field will be replaced by kustomize
-              monitoring:
-                description: This field will be replaced by kustomize
               storage:
                 description: This field will be replaced by kustomize
           icap:
@@ -49,7 +47,5 @@
             properties:
               workloads:
                 description: This field will be replaced by kustomize
-              monitoring:
-                description: This field will be replaced by kustomize
               storage:
                 description: This field will be replaced by kustomize

config/crd/element-deployment/base/starter-core/synapse.yaml

@@ -48,6 +48,8 @@
             properties:
               workloads:
                 description: This field will be replaced by kustomize
+              monitoring:
+                description: This field will be replaced by kustomize
           redis:
             type: object
             description: k8s properties of the redis workloads inside synapse component

config/crd/element-deployment/cleanup/starter-core/kustomization.yaml

@@ -24,11 +24,6 @@ patches:
     metadata:
       name: matrixContentScanner
     $patch: delete
-  - |
-    kind: KustomizeSchema
-    metadata:
-      name: slidingSync
-    $patch: delete
   - |-
     kind: KustomizeSchema
     metadata:
@@ -85,11 +80,6 @@ patches:
     metadata:
       name: k8s-workloads-resources
     $patch: delete
-  - |-
-    kind: KustomizeSchema
-    metadata:
-      name: postgres-golang
-    $patch: delete
   - |-
     kind: KustomizeSchema
     metadata:

config/crd/element-deployment/inline-patches/starter-core/certificates-keys.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 New Vector Ltd
+# Copyright 2023-2024 New Vector Ltd
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -16,19 +16,6 @@
 - op: add
   path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/elementWeb/properties/k8s/properties/ingress/properties/tls/properties/certificate/properties/privateKeySecretKey/description
   value: ElementWeb Private Key
-# slidingSync
-- op: add
-  path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/slidingSync/properties/k8s/properties/ingress/properties/tls/properties/certificate/properties/certFileSecretKey/default
-  value: certificate
-- op: add
-  path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/slidingSync/properties/k8s/properties/ingress/properties/tls/properties/certificate/properties/certFileSecretKey/description
-  value: SlidingSync Certificate
-- op: add
-  path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/slidingSync/properties/k8s/properties/ingress/properties/tls/properties/certificate/properties/privateKeySecretKey/default
-  value: privateKey
-- op: add
-  path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/slidingSync/properties/k8s/properties/ingress/properties/tls/properties/certificate/properties/privateKeySecretKey/description
-  value: SlidingSync Private Key
 # Synapse
 - op: add
   path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/synapse/properties/k8s/properties/ingress/properties/tls/properties/certificate/properties/certFileSecretKey/default

config/crd/element-deployment/inline-patches/starter-core/kustomization.yaml

@@ -49,3 +49,7 @@ patches:
     target:
       kind: CustomResourceDefinition
       name: elementdeployments.matrix.element.io
+  - path: storage-defaults.yaml
+    target:
+      kind: CustomResourceDefinition
+      name: elementdeployments.matrix.element.io

config/crd/element-deployment/inline-patches/starter-core/storage-defaults.yaml

@@ -0,0 +1,15 @@
+# Copyright 2024 New Vector Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+- op: replace
+  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/matrixContentScanner/properties/k8s/properties/clamAntiVirus/properties/storage/default/volume/size'
+  value: 1Gi
+- 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
+- op: replace
+  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/matrixContentScanner/properties/k8s/properties/matrixContentScanner/properties/storage/default/size'
+  value: 10Gi
+# Synapse defaults are configured in config/crd/element-deployment/replacements/starter-core/synapse.yaml

config/crd/element-deployment/inline-patches/starter-core/synapse-op-del-k8s-synapse-storage-volume.yaml

@@ -1,8 +1,17 @@
-# Copyright 2023 New Vector Ltd
+# Copyright 2023-2024 New Vector Ltd
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 
 # Synapse is has not been migrated yet to volume names and size being handled under the k8s key
+# Nuke out everything but storage.volume.storageClassName which is used
 - op: remove
-  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/synapse/properties/k8s/properties/synapse/properties/storage/properties'
+  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/synapse/properties/k8s/properties/synapse/properties/storage/default'
+- op: remove
+  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/synapse/properties/k8s/properties/synapse/properties/storage/properties/volume/default'
+- op: remove
+  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/synapse/properties/k8s/properties/synapse/properties/storage/properties/volume/oneOf'
+- op: remove
+  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/synapse/properties/k8s/properties/synapse/properties/storage/properties/volume/properties/persistentVolumeClaimName'
+- op: remove
+  path: '/spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/synapse/properties/k8s/properties/synapse/properties/storage/properties/volume/properties/size'

config/crd/element-deployment/inline-patches/starter-core/uids-gids.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 New Vector Ltd
+# Copyright 2023-2024 New Vector Ltd
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -29,13 +29,6 @@
 - op: add
   path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/matrixContentScanner/properties/k8s/properties/matrixContentScanner/properties/workloads/properties/securityContext/properties/fsGroup/default
   value: 10151
-# slidingSync
-- op: add
-  path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/slidingSync/properties/k8s/properties/api/properties/workloads/properties/securityContext/properties/runAsUser/default
-  value: 10130
-- op: add
-  path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/slidingSync/properties/k8s/properties/api/properties/workloads/properties/securityContext/properties/fsGroup/default
-  value: 10130
 # Synapse
 - op: add
   path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/components/properties/synapse/properties/k8s/properties/synapse/properties/workloads/properties/securityContext/properties/runAsUser/default

config/crd/element-deployment/replacements/starter-core/default-resources-replacements.yaml

@@ -92,28 +92,6 @@
         name: elementdeployments.matrix.element.io
       fieldPaths:
         - spec.versions.0.schema.openAPIV3Schema.properties.spec.properties.components.properties.matrixContentScanner.properties.k8s.properties.matrixContentScanner.properties.workloads.properties.resources.properties.requests.default
-# slidingSync api
-- source:
-    kind: KustomizeSchema
-    name: default-resources-starter-core
-    fieldPath: spec.schemas.slidingSync.api.limits
-  targets:
-    - select:
-        kind: CustomResourceDefinition
-        name: elementdeployments.matrix.element.io
-      fieldPaths:
-        - spec.versions.0.schema.openAPIV3Schema.properties.spec.properties.components.properties.slidingSync.properties.k8s.properties.api.properties.workloads.properties.resources.properties.limits.default
-# slidingSync api
-- source:
-    kind: KustomizeSchema
-    name: default-resources-starter-core
-    fieldPath: spec.schemas.slidingSync.api.requests
-  targets:
-    - select:
-        kind: CustomResourceDefinition
-        name: elementdeployments.matrix.element.io
-      fieldPaths:
-        - spec.versions.0.schema.openAPIV3Schema.properties.spec.properties.components.properties.slidingSync.properties.k8s.properties.api.properties.workloads.properties.resources.properties.requests.default
 # synapse haproxy
 - source:
     kind: KustomizeSchema