From 23faf440bc80cf4e50b769f2ff716a0fef3e5bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Mon, 9 Oct 2023 14:05:12 +0200 Subject: [PATCH] Deploy meetbot plugins when building in Ansible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- .../openshift-apps/maubot/files/deploymentconfig.yml | 5 ----- roles/openshift-apps/maubot/files/storage.yml | 11 ----------- .../openshift-apps/maubot/templates/buildconfig.yml | 12 +++++++++++- roles/openshift-apps/maubot/templates/config.yml | 8 +------- 4 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 roles/openshift-apps/maubot/files/storage.yml diff --git a/roles/openshift-apps/maubot/files/deploymentconfig.yml b/roles/openshift-apps/maubot/files/deploymentconfig.yml index 1730290df9..6f2cb6c3ca 100644 --- a/roles/openshift-apps/maubot/files/deploymentconfig.yml +++ b/roles/openshift-apps/maubot/files/deploymentconfig.yml @@ -26,8 +26,6 @@ spec: - name: config mountPath: /config readOnly: true - - name: maubot-storage - mountPath: /maubot - name: meetbot-logs mountPath: /meetbot_logs - name: ipa-config-volume @@ -66,9 +64,6 @@ spec: - name: config configMap: name: config - - name: maubot-storage - persistentVolumeClaim: - claimName: maubot-storage - name: meetbot-logs persistentVolumeClaim: claimName: meetbot-logs diff --git a/roles/openshift-apps/maubot/files/storage.yml b/roles/openshift-apps/maubot/files/storage.yml deleted file mode 100644 index 42c4d7952b..0000000000 --- a/roles/openshift-apps/maubot/files/storage.yml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: maubot-storage -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi - storageClassName: ocs-storagecluster-cephfs diff --git a/roles/openshift-apps/maubot/templates/buildconfig.yml b/roles/openshift-apps/maubot/templates/buildconfig.yml index 768b407add..b5b8083992 100644 --- a/roles/openshift-apps/maubot/templates/buildconfig.yml +++ b/roles/openshift-apps/maubot/templates/buildconfig.yml @@ -12,8 +12,18 @@ spec: source: dockerfile: |- FROM fedora:38 - RUN dnf -y install python3-pip python3-gssapi && dnf -y clean all + RUN dnf -y install python3-pip python3-gssapi git && dnf -y clean all RUN pip install maubot[encryption] python-slugify httpx httpx_gssapi jinja2 fedora-messaging meetbot-messages + RUN \ + curl https://raw.githubusercontent.com/fedora-infra/matrix-bots/main/install-plugins-from-git.py -o /usr/local/bin/install-maubot-plugins && \ + chmod +x /usr/local/bin/install-maubot-plugins && \ + mkdir /maubot && \ + for plugin in maubot-fedora maubot-adminclient; do \ + install-maubot-plugins -o /maubot -b staging https://github.com/fedora-infra/${plugin}; \ + done && \ + install-maubot-plugins -o /maubot \ + https://github.com/jkhsjdhjs/maubot-webhook.git \ + https://github.com/GregSutcliffe/maubot-meetings.git WORKDIR /maubot ENV KRB5_CONFIG=/etc/ipa/krb5.conf ENTRYPOINT /usr/bin/python3 -m maubot -c /config/config.yml diff --git a/roles/openshift-apps/maubot/templates/config.yml b/roles/openshift-apps/maubot/templates/config.yml index 585cc84de9..098a419872 100644 --- a/roles/openshift-apps/maubot/templates/config.yml +++ b/roles/openshift-apps/maubot/templates/config.yml @@ -61,12 +61,6 @@ logging: normal: format: "[%(asctime)s] [%(levelname)s@%(name)s] %(message)s" handlers: - file: - class: logging.handlers.RotatingFileHandler - formatter: normal - filename: /maubot/maubot.log - maxBytes: 10485760 - backupCount: 10 console: class: logging.StreamHandler formatter: colored @@ -79,4 +73,4 @@ logging: level: WARN root: level: WARN - handlers: [file, console] + handlers: [console]