2.21.1

Dockerfile.base

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-FROM python:3.11-slim-bookworm AS build
+FROM python:3.12-slim-bookworm AS build
 RUN apt --yes update && apt --yes install git curl libc-bin && \
     ls -l /usr/lib/locale
 
@@ -14,7 +14,7 @@ RUN apt update && apt install -y git make && \
     cd /workspace && \
     git clone https://github.com/element-hq/ansible-operator-plugins.git && \
     cd ansible-operator-plugins && \
-    git checkout v1.35.0-mark-unsafe-non-spec-object-main && \
+    git checkout element && \
     make build/ansible-operator && \
     mv ./ansible-operator /usr/local/bin/ansible-operator && \
     chmod +x /usr/local/bin/ansible-operator && /usr/local/bin/ansible-operator version
@@ -72,7 +72,7 @@ FROM gcr.io/distroless/python3-debian12 AS base
 ARG GIT_COMMIT=devel
 LABEL git_commit=$GIT_COMMIT
 
-COPY --from=base-builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
+COPY --from=base-builder /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
 COPY --from=base-builder /etc/ansible /etc/ansible
 COPY --from=base-builder /ansible /ansible
 COPY --from=base-builder /usr/local/bin /usr/local/bin

Dockerfile.operator

@@ -6,7 +6,7 @@ ARG DISTROLESS_BASE_IMAGE=registry.gitlab.element.io/engineering/ess/operator/el
 
 
 # We need to run a first build step to remove elementdeployment role
-FROM python:3.11-slim-bookworm AS build-tmp
+FROM python:3.12-slim-bookworm AS build-tmp
 
 COPY LICENSES/operator /element.io/LICENSES
 COPY watches.yaml /element.io/watches.yaml

Dockerfile.updater

@@ -18,6 +18,7 @@ COPY roles/teardown   /element.io/roles/teardown/
 COPY roles/generic_apply  /element.io/roles/generic_apply/
 COPY playbooks/elementdeployment.yml playbooks/any.yml /element.io/playbooks/
 
+USER 0
 RUN chmod -R 0755 /element.io
 
 USER 32001

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

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

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

@@ -227,6 +227,7 @@ spec:
                             description: Number of instances of this worker type
                             type: integer
                             default: 1
+                            minimum: 1
                           resources:
                             description: This field will be generated by kustomize
                     resources:

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

@@ -41,11 +41,6 @@ patches:
     metadata:
       name: workloads-starter-core
     $patch: delete
-  - |-
-    kind: KustomizeSchema
-    metadata:
-      name: persistent-volume-claim-template-starter-core
-    $patch: delete
   - |-
     kind: KustomizeSchema
     metadata:

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

@@ -13,25 +13,6 @@ spec:
       requests:
         cpu: 50m
         memory: 50Mi
-    matrixContentScanner:
-      icap:
-        limits:
-          memory: 1Gi
-        requests:
-          cpu: 100m
-          memory: 100Mi
-      clamAntiVirus:
-        limits:
-          memory: 4Gi
-        requests:
-          cpu: 100m
-          memory: 100Mi
-      matrixContentScanner:
-        limits:
-          memory: 500Mi
-        requests:
-          cpu: 100m
-          memory: 100Mi
     synapse:
       haproxy:
         limits:

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

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