use inv-sig-helper instead of inv-companion

cluster/apps/invidious/invidious-config.yml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -8,19 +9,12 @@ data:
     db:
       dbname: invidious
       user: kemal
-      password: "${INVIDIOUS_DB_PASSWORD}"
+      password: ${INVIDIOUS_DB_PASSWORD}
       host: invidious-db-service
       port: 5432
     check_tables: true
-    invidious_companion:
-    - private_url: "http://invidious-companion-service:8282"
-    - public_url: "https://companion.akshub-lab.uk"
-    invidious_companion_key: "${INVIDIOUS_COMPANION_KEY}"
-    hmac_key: "${INVIDIOUS_HMAC_KEY}"
-    external_port: 443
-    domain: invidious.akshub-lab.uk
-    http_proxy:
-      user: akshun
-      password: "${INVIDIOUS_HTTP_PROXY_PASSWORD}"
-      host: gluetun-service
-      port: 8888
+    signature_server: inv-sig-helper:12999
+    visitor_data: ${VISITOR_DATA}
+    po_token: ${PO_TOKEN}
+    port: 3000
+    hmac_key: ${INVIDIOUS_HMAC_KEY}

cluster/apps/invidious/invidious-helper.yml

@@ -2,77 +2,29 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: invidious-companion
+  name: inv-sig-helper
   namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: invidious-companion
+      app: inv-sig-helper
   template:
     metadata:
       labels:
-        app: invidious-companion
+        app: inv-sig-helper
     spec:
-      initContainers:
-      - name: vpn
-        restartPolicy: Always
-        image: qmcgaw/gluetun:v3.40.0
-        securityContext:
-          capabilities:
-            add:
-            - NET_ADMIN
-        env:
-        - name: OPENVPN_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: openvpn-secrets
-              key: OPENVPN_PASSWORD
-        - name: OPENVPN_USER
-          valueFrom:
-            secretKeyRef:
-              name: openvpn-secrets
-              key: OPENVPN_USER
-        - name: VPN_SERVICE_PROVIDER
-          value: "surfshark"
-        - name: SERVER_COUNTRIES
-          value: "Netherlands"
-        - name: FIREWALL_INPUT_PORTS
-          value: "8282"
-        - name: FIREWALL_VPN_INPUT_PORTS
-          value: "8282"
-        - name: FIREWALL_OUTBOUND_SUBNETS
-          value: "192.168.1.0/24"
-        - name: DOT
-          value: "on"
-        - name: DNS_ADDRESS
-          value: "8.8.8.8"
-        volumeMounts:
-        - name: companion-cache
-          mountPath: /var/tmp/youtubei.js
-          subPath: youtubei.js
       containers:
-      - name: invidious-companion
-        image: quay.io/invidious/invidious-companion@sha256:ac8fba6123adca367bf6fec18da788d420dd9b1167e8a3911375df42e88a1952
+      - name: inv-sig-helper
+        image: quay.io/invidious/inv-sig-helper@sha256:b5466c9add729e82e4e3ee5515c30b69df02d78ebb2486dbc9c63e456f29083d
+        args: ["--tcp", "0.0.0.0:12999"]
         env:
-        - name: SERVER_SECRET_KEY
-          valueFrom:
-            secretKeyRef:
-              name: invidious-secrets
-              key: SERVER_SECRET_KEY
+        - name: RUST_LOG
+          value: "info"
         ports:
-        - containerPort: 8282
+        - containerPort: 12999
         securityContext:
-          allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
           capabilities:
             drop:
             - ALL
-        volumeMounts:
-        - name: companion-cache
-          mountPath: /var/tmp/youtubei.js
-          subPath: youtubei.js
-      volumes:
-      - name: companion-cache
-        persistentVolumeClaim:
-          claimName: longhorn-invidious-cache

cluster/apps/invidious/invidious-svc.yml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -7,23 +8,37 @@ spec:
   selector:
     app: invidious-db
   ports:
-    - protocol: TCP
-      port: 5432
-      targetPort: 5432
+  - protocol: TCP
+    port: 5432
+    targetPort: 5432
 
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: invidious-companion-service
+  name: invidious
   namespace: default
 spec:
   selector:
-    app: invidious-companion
+    app: invidious
   ports:
-    - protocol: TCP
-      port: 8282
-      targetPort: 8282
+  - protocol: TCP
+    port: 3000
+    targetPort: 3000
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: inv-sig-helper
+  namespace: default
+spec:
+  selector:
+    app: inv-sig-helper
+  ports:
+  - protocol: TCP
+    port: 12999
+    targetPort: 12999
 
 ---
 apiVersion: v1
@@ -39,20 +54,4 @@ spec:
   - port: 3000
     targetPort: 3000
     nodePort: 3111
-    protocol: TCP
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: invidious-companion-ext-service
-  namespace: default
-spec:
-  type: NodePort
-  selector:
-    app: invidious-companion
-  ports:
-  - port: 8282
-    targetPort: 8282
-    nodePort: 30082
-    protocol: TCP
+    protocol: TCP

cluster/apps/invidious/invidious.yml

@@ -21,7 +21,7 @@ spec:
         - sh
         - -c
         - |
-          until nc -z -v -w30 invidious-companion-service 8282; do
+          until nc -z -v -w30 inv-sig-helper 12999; do
             echo "Waiting for companion to be ready..."
             sleep 2
           done
@@ -65,14 +65,6 @@ spec:
           value: "3000"
         ports:
         - containerPort: 3000
-        livenessProbe:
-          httpGet:
-            path: /api/v1/trending
-            port: 3000
-          initialDelaySeconds: 30
-          periodSeconds: 30
-          timeoutSeconds: 5
-          failureThreshold: 2
         volumeMounts:
         - name: logging
           mountPath: /var/log/invidious