From 97c65897e56a12e6c88bf484dd8f11afdd241393 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Mon, 12 Feb 2024 11:27:02 +0100 Subject: Deploy biboumi as irc gateway --- .../tyilnet/chat-system/biboumi/deployment.yaml | 60 ++++++++++++++++++++++ .../tyilnet/chat-system/prosody/configmap.yaml | 13 ++++- .../tyilnet/chat-system/prosody/deployment.yaml | 8 ++- .../tyilnet/chat-system/prosody/service.yaml | 30 ++++++++++- 4 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 data.d/k3s-master/manifests.d/tyilnet/chat-system/biboumi/deployment.yaml diff --git a/data.d/k3s-master/manifests.d/tyilnet/chat-system/biboumi/deployment.yaml b/data.d/k3s-master/manifests.d/tyilnet/chat-system/biboumi/deployment.yaml new file mode 100644 index 0000000..0288982 --- /dev/null +++ b/data.d/k3s-master/manifests.d/tyilnet/chat-system/biboumi/deployment.yaml @@ -0,0 +1,60 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: biboumi + namespace: chat-system + labels: + app.kubernetes.io/created-by: tyil + app.kubernetes.io/managed-by: manual + app.kubernetes.io/name: biboumi + app.kubernetes.io/part-of: chat-system +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/created-by: tyil + app.kubernetes.io/managed-by: manual + app.kubernetes.io/name: biboumi + app.kubernetes.io/part-of: chat-system + strategy: + type: RollingUpdate + template: + metadata: + labels: + app.kubernetes.io/created-by: tyil + app.kubernetes.io/managed-by: manual + app.kubernetes.io/name: biboumi + app.kubernetes.io/part-of: chat-system + spec: + containers: + - image: louiz/biboumi:9.0 + name: biboumi + ports: + - containerPort: 5437 + volumeMounts: + env: + - name: BIBOUMI_ADMIN + value: tyil@chat.tyil.nl + - name: BIBOUMI_DB_NAME + valueFrom: + secretKeyRef: + name: biboumi-config + key: db-name + - name: BIBOUMI_HOSTNAME + value: biboumi.chat.tyil.nl + - name: BIBOUMI_PASSWORD + valueFrom: + secretKeyRef: + name: biboumi-config + key: password + - name: BIBOUMI_XMPP_SERVER_IP + value: prosody + - name: BIBOUMI_PERSISTENT_BY_DEFAULT + value: "true" + restartPolicy: Always + volumes: + - name: config + secret: + secretName: biboumi-config +... diff --git a/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/configmap.yaml b/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/configmap.yaml index 445d568..be624b0 100644 --- a/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/configmap.yaml +++ b/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/configmap.yaml @@ -118,7 +118,18 @@ data: statistics = "internal" -- Load configuration from secrets - Include "conf.d/*" + Include "secrets.d/*" + + -- Configure components + component_ports = { + 5347, + } + component_interfaces = { + "*", + "::", + } + + Include "components.d/*" -- Load configuration for additional hosts Include "hosts.d/*" diff --git a/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/deployment.yaml b/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/deployment.yaml index 80713c8..ad91eea 100644 --- a/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/deployment.yaml +++ b/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/deployment.yaml @@ -33,11 +33,14 @@ spec: ports: - containerPort: 5222 - containerPort: 5269 + - containerPort: 5347 volumeMounts: - mountPath: /etc/prosody name: config - - mountPath: /etc/prosody/conf.d + - mountPath: /etc/prosody/secrets.d name: config-secret + - mountPath: /etc/prosody/components.d + name: config-components - mountPath: /etc/prosody/hosts.d name: config-hosts - mountPath: /etc/prosody/certs.d/chat.tyil.nl @@ -51,6 +54,9 @@ spec: - name: config-secret secret: secretName: prosody-config + - name: config-components + secret: + secretName: prosody-components - name: config-hosts configMap: name: prosody-vhosts diff --git a/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/service.yaml b/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/service.yaml index 4e7bb3f..8ecd4b8 100644 --- a/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/service.yaml +++ b/data.d/k3s-master/manifests.d/tyilnet/chat-system/prosody/service.yaml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/created-by: tyil app.kubernetes.io/managed-by: manual - app.kubernetes.io/name: prosody + app.kubernetes.io/name: xmpp app.kubernetes.io/part-of: chat-system spec: selector: @@ -24,3 +24,31 @@ spec: port: 5269 nodePort: 5269 ... +--- +apiVersion: v1 +kind: Service +metadata: + name: prosody + namespace: chat-system + labels: + app.kubernetes.io/created-by: tyil + app.kubernetes.io/managed-by: manual + app.kubernetes.io/name: prosody + app.kubernetes.io/part-of: chat-system +spec: + selector: + app.kubernetes.io/created-by: tyil + app.kubernetes.io/managed-by: manual + app.kubernetes.io/name: prosody + app.kubernetes.io/part-of: chat-system + ports: + - name: xmpp-c2s + port: 5222 + targetPort: 5222 + - name: xmpp-s2s + port: 5269 + targetPort: 5269 + - name: components + port: 5347 + targetPort: 5347 +... -- cgit v1.1