diff --git a/k8s/generic-device-plugin/ds.yaml b/k8s/generic-device-plugin/ds.yaml index b425306..15aeea3 100644 --- a/k8s/generic-device-plugin/ds.yaml +++ b/k8s/generic-device-plugin/ds.yaml @@ -46,8 +46,8 @@ spec: groups: - count: 1 usb: - - vendor: "1A86" - product: "55D4" + - vendor: "10C4" + product: "EA60" name: generic-device-plugin resources: requests: diff --git a/k8s/meshtastic/kustomization.yaml b/k8s/meshtastic/kustomization.yaml index 92bb515..0b569db 100644 --- a/k8s/meshtastic/kustomization.yaml +++ b/k8s/meshtastic/kustomization.yaml @@ -4,7 +4,8 @@ namespace: meshtastic resources: - namespace.yaml - matrix-meshtastic-bridge.yaml -secretGenerator: + - secrets.yaml +configMapGenerator: - name: matrix-meshtastic-bridge files: - matrix-meshtastic-bridge/config.json diff --git a/k8s/meshtastic/matrix-meshtastic-bridge.yaml b/k8s/meshtastic/matrix-meshtastic-bridge.yaml index 0fe390e..fe8018d 100644 --- a/k8s/meshtastic/matrix-meshtastic-bridge.yaml +++ b/k8s/meshtastic/matrix-meshtastic-bridge.yaml @@ -19,7 +19,7 @@ spec: effect: NoSchedule containers: - name: matrix-meshtastic-bridge - image: git.janky.solutions/finn/matrix-meshtastic-bridge:sha-008f7cd + image: git.janky.solutions/finn/matrix-meshtastic-bridge:sha-af3d7c3 securityContext: privileged: true env: @@ -27,6 +27,9 @@ spec: value: debug - name: CONFIG_PATH value: /config/config.json + envFrom: + - secretRef: + name: matrix-meshtastic-bridge resources: limits: janky.solutions/meshtastic: "1" @@ -34,22 +37,22 @@ spec: - name: config mountPath: /config - name: ttyacm0 - mountPath: /dev/ttyACM0 + mountPath: /dev/ttyUSB1 - name: data mountPath: /data volumes: - name: config - secret: - secretName: matrix-meshtastic-bridge + configMap: + name: matrix-meshtastic-bridge - name: ttyacm0 hostPath: type: CharDevice - path: /dev/ttyACM0 + path: /dev/ttyUSB1 volumeClaimTemplates: - metadata: name: data spec: - storageClassName: longhorn + storageClassName: local-path accessModes: ["ReadWriteOnce"] resources: requests: diff --git a/k8s/meshtastic/matrix-meshtastic-bridge/config.json b/k8s/meshtastic/matrix-meshtastic-bridge/config.json index ab6af29..c59f642 100644 --- a/k8s/meshtastic/matrix-meshtastic-bridge/config.json +++ b/k8s/meshtastic/matrix-meshtastic-bridge/config.json @@ -6,7 +6,7 @@ "state": "/data/matrix.db" }, "meshtastic": { - "device": "/dev/ttyACM0" + "device": "/dev/ttyUSB1" }, "db": "sqlite:///data/bridge.db" }