Skip to content

WIP: prepare for OFTC bridge to go down#345

Closed
RyanSquared wants to merge 1 commit intomasterfrom
ryansquared/prep-matterbridge-for-matrix-split
Closed

WIP: prepare for OFTC bridge to go down#345
RyanSquared wants to merge 1 commit intomasterfrom
ryansquared/prep-matterbridge-for-matrix-split

Conversation

@RyanSquared
Copy link
Member

Merge this commit when OFTC bridge is offline, to deploy HashBot to the stagex rooms and begin bridging.

Merge this commit when OFTC bridge is offline, to deploy HashBot to the
stagex rooms and begin bridging.
@RyanSquared RyanSquared marked this pull request as draft February 24, 2025 03:08
@github-actions
Copy link

Infro diff for 4c3c835

argocd.hashbang.sh > ircd (0 files changed)

Details
time="2025-02-24T03:08:47Z" level=warning msg="Failed to invoke grpc call. Use flag --grpc-web in grpc calls. To avoid this warning message, use flag --grpc-web."
time="2025-02-24T03:08:50Z" level=warning msg="Failed to invoke grpc call. Use flag --grpc-web in grpc calls. To avoid this warning message, use flag --grpc-web."

===== apps/Deployment ircd/irc-deployment ======
--- /tmp/argocd-diff1583582521/irc-deployment-live.yaml
+++ /tmp/argocd-diff1583582521/irc-deployment
@@ -30,7 +30,7 @@
         app: irc
     spec:
       containers:
-      - image: ghcr.io/ergochat/ergo:v2.14.0@sha256:ef4040d18044a53c8c995defb3159018cf2e83030e5db068c3976d9343c826a5
+      - image: ghcr.io/ergochat/ergo:v2.15.0@sha256:135cd42c6300d957e0045ee53fbe886e43e1c04bb621391ed7b8940c174d68f3
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -78,7 +78,7 @@
           echo "Exiting.";
         command:
         - /bin/sh
-        image: ghcr.io/ergochat/ergo:v2.14.0@sha256:ef4040d18044a53c8c995defb3159018cf2e83030e5db068c3976d9343c826a5
+        image: ghcr.io/ergochat/ergo:v2.15.0@sha256:135cd42c6300d957e0045ee53fbe886e43e1c04bb621391ed7b8940c174d68f3
         imagePullPolicy: IfNotPresent
         name: config-reloader
         resources: {}

argocd.hashbang.sh > matterbridge (2 files changed)

Details
time="2025-02-24T03:08:58Z" level=warning msg="Failed to invoke grpc call. Use flag --grpc-web in grpc calls. To avoid this warning message, use flag --grpc-web."
time="2025-02-24T03:09:00Z" level=warning msg="Failed to invoke grpc call. Use flag --grpc-web in grpc calls. To avoid this warning message, use flag --grpc-web."

===== /ConfigMap matterbridge/matterbridge-config-d9mbk6kcbb ======
--- /tmp/argocd-diff3016595981/matterbridge-config-d9mbk6kcbb-live.yaml
+++ /tmp/argocd-diff3016595981/matterbridge-config-d9mbk6kcbb
@@ -1,94 +0,0 @@
-apiVersion: v1
-data:
-  matterbridge.toml: |
-    [irc.hashbang]
-    Server = "irc-internal.ircd.svc:6697"
-    Nick = "HashBot"
-    UseTLS = true
-    # because it uses internal traffic
-    SkipTLSVerify = true
-    Label = "h"
-    RemoteNickFormat = "{NICK}/{LABEL}"
-    NickServNick = "HashBot"
-    UseSASL = true
-    UseRelayMsg = true
-    # RELAYMSG barfs on non-ascii, but we can limit to just alphanumeric
-    StripNick = true
-
-    [irc.libera]
-    Server = "irc.libera.chat:6697"
-    Nick = "HashBot"
-    UseTLS = true
-    Label = "l"
-    RemoteNickFormat = "<{NICK}[{LABEL}]> "
-    NickServNick = "HashBot"
-    UseSASL = true
-
-    [matrix.main]
-    Server = "https://matrix.org"
-    Login = "HashBot"
-    Label = "m"
-    RemoteNickFormat = "<{NICK}[{LABEL}]> "
-    # Matterbridge no longer uses usernames, instead uses display names
-    # To re-enable:
-    # UseUsername = true
-    # NoHomeServerSuffix = false
-    HTMLDisable = true
-
-    [[gateway]]
-    name = "default"
-    enable = true
-
-    [[gateway.inout]]
-    account = "irc.hashbang"
-    channel = "#!"
-
-    [[gateway.inout]]
-    account = "irc.libera"
-    channel = "#!"
-
-    [[gateway.inout]]
-    account = "matrix.main"
-    channel = "#!:matrix.org"
-
-    [[gateway]]
-    name = "social"
-    enable = true
-
-    [[gateway.inout]]
-    account = "irc.hashbang"
-    channel = "#!social"
-
-    [[gateway.inout]]
-    account = "matrix.main"
-    channel = "#!social:matrix.org"
-kind: ConfigMap
-metadata:
-  annotations:
-    argocd.argoproj.io/tracking-id: matterbridge:/ConfigMap:matterbridge/matterbridge-config-d9mbk6kcbb
-    kubectl.kubernetes.io/last-applied-configuration: |
-      {"apiVersion":"v1","data":{"matterbridge.toml":"[irc.hashbang]\nServer = \"irc-internal.ircd.svc:6697\"\nNick = \"HashBot\"\nUseTLS = true\n# because it uses internal traffic\nSkipTLSVerify = true\nLabel = \"h\"\nRemoteNickFormat = \"{NICK}/{LABEL}\"\nNickServNick = \"HashBot\"\nUseSASL = true\nUseRelayMsg = true\n# RELAYMSG barfs on non-ascii, but we can limit to just alphanumeric\nStripNick = true\n\n[irc.libera]\nServer = \"irc.libera.chat:6697\"\nNick = \"HashBot\"\nUseTLS = true\nLabel = \"l\"\nRemoteNickFormat = \"\u003c{NICK}[{LABEL}]\u003e \"\nNickServNick = \"HashBot\"\nUseSASL = true\n\n[matrix.main]\nServer = \"https://matrix.org\"\nLogin = \"HashBot\"\nLabel = \"m\"\nRemoteNickFormat = \"\u003c{NICK}[{LABEL}]\u003e \"\n# Matterbridge no longer uses usernames, instead uses display names\n# To re-enable:\n# UseUsername = true\n# NoHomeServerSuffix = false\nHTMLDisable = true\n\n[[gateway]]\nname = \"default\"\nenable = true\n\n[[gateway.inout]]\naccount = \"irc.hashbang\"\nchannel = \"#!\"\n\n[[gateway.inout]]\naccount = \"irc.libera\"\nchannel = \"#!\"\n\n[[gateway.inout]]\naccount = \"matrix.main\"\nchannel = \"#!:matrix.org\"\n\n[[gateway]]\nname = \"social\"\nenable = true\n\n[[gateway.inout]]\naccount = \"irc.hashbang\"\nchannel = \"#!social\"\n\n[[gateway.inout]]\naccount = \"matrix.main\"\nchannel = \"#!social:matrix.org\"\n"},"kind":"ConfigMap","metadata":{"annotations":{"argocd.argoproj.io/tracking-id":"matterbridge:/ConfigMap:matterbridge/matterbridge-config-d9mbk6kcbb"},"labels":{"app.kubernetes.io/instance":"matterbridge"},"name":"matterbridge-config-d9mbk6kcbb","namespace":"matterbridge"}}
-  labels:
-    app.kubernetes.io/instance: matterbridge
-  managedFields:
-  - apiVersion: v1
-    fieldsType: FieldsV1
-    fieldsV1:
-      f:data:
-        .: {}
-        f:matterbridge.toml: {}
-      f:metadata:
-        f:annotations:
-          .: {}
-          f:argocd.argoproj.io/tracking-id: {}
-          f:kubectl.kubernetes.io/last-applied-configuration: {}
-        f:labels:
-          .: {}
-          f:app.kubernetes.io/instance: {}
-    manager: argocd-controller
-    operation: Update
-    time: "2023-12-18T05:41:46Z"
-  name: matterbridge-config-d9mbk6kcbb
-  namespace: matterbridge
-  resourceVersion: "358812223"
-  uid: c52f1764-70e9-4bce-9214-dce7a17ab970

===== apps/Deployment matterbridge/matterbridge ======
--- /tmp/argocd-diff2978692700/matterbridge-live.yaml
+++ /tmp/argocd-diff2978692700/matterbridge
@@ -214,22 +214,27 @@
           valueFrom:
             secretKeyRef:
               key: hashbang-password
-              name: matterbridge-secret-d4f8kbbfgc
+              name: matterbridge-secret-ch58gb777c
         - name: MATTERBRIDGE_IRC_FREENODE_NICKSERVPASSWORD
           valueFrom:
             secretKeyRef:
               key: freenode-password
-              name: matterbridge-secret-d4f8kbbfgc
+              name: matterbridge-secret-ch58gb777c
         - name: MATTERBRIDGE_IRC_LIBERA_NICKSERVPASSWORD
           valueFrom:
             secretKeyRef:
               key: libera-password
-              name: matterbridge-secret-d4f8kbbfgc
+              name: matterbridge-secret-ch58gb777c
+        - name: MATTERBRIDGE_IRC_OFTC_NICKSERVPASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: oftc-password
+              name: matterbridge-secret-ch58gb777c
         - name: MATTERBRIDGE_MATRIX_MAIN_PASSWORD
           valueFrom:
             secretKeyRef:
               key: matrix-password
-              name: matterbridge-secret-d4f8kbbfgc
+              name: matterbridge-secret-ch58gb777c
         image: 42wim/matterbridge:1.26.0@sha256:ba9ae3b54776d4e4a1317cd7929d62326f7d3dd75e37eb038e01e33e18e41164
         imagePullPolicy: IfNotPresent
         name: matterbridge
@@ -247,7 +252,7 @@
       volumes:
       - configMap:
           defaultMode: 420
-          name: matterbridge-config-d9mbk6kcbb
+          name: matterbridge-config-52b4kbcfk7
         name: matterbridge-config
 status:
   availableReplicas: 1

===== /ConfigMap matterbridge/matterbridge-config-52b4kbcfk7 ======
--- /tmp/argocd-diff3325745568/matterbridge-config-52b4kbcfk7-live.yaml
+++ /tmp/argocd-diff3325745568/matterbridge-config-52b4kbcfk7
@@ -0,0 +1,93 @@
+apiVersion: v1
+data:
+  matterbridge.toml: |
+    [irc.hashbang]
+    Server = "irc-internal.ircd.svc:6697"
+    Nick = "HashBot"
+    UseTLS = true
+    # because it uses internal traffic
+    SkipTLSVerify = true
+    Label = "h"
+    RemoteNickFormat = "{NICK}/{LABEL}"
+    NickServNick = "HashBot"
+    UseSASL = true
+    UseRelayMsg = true
+    # RELAYMSG barfs on non-ascii, but we can limit to just alphanumeric
+    StripNick = true
+
+    [irc.libera]
+    Server = "irc.libera.chat:6697"
+    Nick = "HashBot"
+    UseTLS = true
+    Label = "l"
+    RemoteNickFormat = "<{NICK}[{LABEL}]> "
+    NickServNick = "HashBot"
+    UseSASL = true
+
+    [irc.oftc]
+    Server = "irc.oftc.net:6697"
+    Nick = "HashBot"
+    UseTLS = true
+    Label = "o"
+    RemoteNickFormat = "<{NICK}[{LABEL}]> "
+    NickServNick = "HashBot"
+    UseSASL = true
+
+    [matrix.main]
+    Server = "https://matrix.org"
+    Login = "HashBot"
+    Label = "m"
+    RemoteNickFormat = "<{NICK}[{LABEL}]> "
+    # Matterbridge no longer uses usernames, instead uses display names
+    # To re-enable:
+    # UseUsername = true
+    # NoHomeServerSuffix = false
+    HTMLDisable = true
+
+    [[gateway]]
+    name = "default"
+    enable = true
+
+    [[gateway.inout]]
+    account = "irc.hashbang"
+    channel = "#!"
+
+    [[gateway.inout]]
+    account = "irc.libera"
+    channel = "#!"
+
+    [[gateway.inout]]
+    account = "matrix.main"
+    channel = "#!:matrix.org"
+
+    [[gateway]]
+    name = "social"
+    enable = true
+
+    [[gateway.inout]]
+    account = "irc.hashbang"
+    channel = "#!social"
+
+    [[gateway.inout]]
+    account = "matrix.main"
+    channel = "#!social:matrix.org"
+
+    [[gateway]]
+    name = "stagex"
+    enable = true
+
+    [[gateway.inout]]
+    account = "irc.oftc"
+    channel = "#stagex"
+
+    [[gateway.inout]]
+    account = "matrix.main"
+    channel = "#stagex:matrix.org"
+kind: ConfigMap
+metadata:
+  annotations:
+    argocd.argoproj.io/tracking-id: matterbridge:/ConfigMap:matterbridge/matterbridge-config-52b4kbcfk7
+  labels:
+    app.kubernetes.io/instance: matterbridge
+  name: matterbridge-config-52b4kbcfk7
+  namespace: matterbridge

@RyanSquared
Copy link
Member Author

Element will continue sponsoring the Matrix bridge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant