Compare commits

...

29 Commits

Author SHA1 Message Date
Martyn 543aa20d9f Arrrrgggggggghhhhhhh
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-11-09 16:20:51 +00:00
Martyn 1bcb250284 Fixing the almost nuked z2m
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-11-09 16:08:11 +00:00
Martyn 1bf04a6d88 Don't hardcode namespaces please!
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-11-09 15:50:03 +00:00
Martyn 4cc335199c New z2m new copypasta errors
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-11-09 15:39:14 +00:00
Martyn aecbdfd3b2 New coordinator, new z2m
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-11-09 15:37:01 +00:00
Martyn f21201c330 Merge pull request 'Update Helm release nvidia-device-plugin to v0.17.0' (#5) from renovate/nvidia-device-plugin-0.x into main
Reviewed-on: #5
2024-11-03 17:07:40 +00:00
Martyn 1a69ffc2eb Merge pull request 'Update binwiederhier/ntfy Docker tag to v2' (#9) from renovate/binwiederhier-ntfy-2.x into main
Reviewed-on: #9
2024-11-03 17:07:23 +00:00
Martyn aae5e0b6c7 Merge pull request 'Update Helm release node-feature-discovery to v0.16.6' (#10) from renovate/node-feature-discovery-0.x into main
Reviewed-on: #10
2024-11-03 17:04:14 +00:00
Renovate bot db46dbff82 Update Helm release nvidia-device-plugin to v0.17.0 2024-11-01 00:00:48 +00:00
Renovate bot a95d6096d5 Update Helm release node-feature-discovery to v0.16.6 2024-10-31 00:00:29 +00:00
Martyn d598aa415a No need to try and mount something here
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-19 20:20:10 +00:00
Martyn 169d16eca3 And use it
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-19 20:17:18 +00:00
Martyn 7dc56b0174 And use it
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-19 20:15:24 +00:00
Martyn c4f5a81b7a Overlayfs ftw
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-19 20:11:15 +00:00
Martyn 5a175191d1 Don't overwrite the running config
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-18 09:34:13 +00:00
Renovate bot 069489e9b3 Update binwiederhier/ntfy Docker tag to v2 2024-10-18 00:01:08 +00:00
Martyn cc5be09855 Merge pull request 'Update codercom/code-server Docker tag to v4.93.1' (#7) from renovate/codercom-code-server-4.x into main
Reviewed-on: #7
2024-10-17 18:26:09 +00:00
Martyn e3249bfe6a Merge pull request 'Update binwiederhier/ntfy Docker tag to v1.31.0' (#6) from renovate/binwiederhier-ntfy-1.x into main
Reviewed-on: #6
2024-10-17 18:25:22 +00:00
Martyn 69f09df8fd Merge pull request 'Update Helm release node-feature-discovery to v0.16.5' (#4) from renovate/node-feature-discovery-0.x into main
Reviewed-on: #4
2024-10-17 18:24:52 +00:00
Martyn 29085e1eca Because of subdir?
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-17 15:34:12 +00:00
Martyn fce4e2b9f3 Moving things still
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-17 15:25:13 +00:00
Martyn a3762bc496 Move along please
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-17 12:49:55 +00:00
Renovate bot ef8d0fa981 Update codercom/code-server Docker tag to v4.93.1 2024-10-17 00:00:44 +00:00
Renovate bot 81dcb12c63 Update binwiederhier/ntfy Docker tag to v1.31.0 2024-10-17 00:00:43 +00:00
Martyn 86a6efa378 make some room please, moving stuff
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-16 18:23:01 +00:00
Renovate bot 031d22edfd Update Helm release node-feature-discovery to v0.16.5 2024-10-16 00:00:21 +00:00
Martyn a4aafb92a6 Upgrade time 2024-10-15 11:34:14 +00:00
Martyn bf4afb03d1 Merge pull request 'Update sirfragalot/hyperion.ng Docker tag to v2.0.16' (#2) from renovate/sirfragalot-hyperion.ng-2.x into main
Reviewed-on: #2
2024-10-15 11:27:19 +00:00
Renovate bot 5dbf1bb1d7 Update sirfragalot/hyperion.ng Docker tag to v2.0.16 2024-10-15 11:26:40 +00:00
24 changed files with 288 additions and 23 deletions

View File

@ -6,7 +6,7 @@ replicaCount: 1
image:
repository: codercom/code-server
tag: '4.8.0'
tag: '4.93.1'
pullPolicy: Always
secret:

View File

@ -2,7 +2,7 @@ hyperion:
hyperion:
image:
repository: sirfragalot/hyperion.ng
tag: 2.0.15
tag: 2.0.16
replicas: 1
kubernetesClusterDomain: cluster.local
pvc:

View File

@ -8,7 +8,7 @@ image:
repository: binwiederhier/ntfy
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "v1.27.2"
tag: "v2.11.0"
imagePullSecrets: []
nameOverride: ""

View File

@ -31,7 +31,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
image: docker.io/jellyfin/jellyfin:10.9.7
image: docker.io/jellyfin/jellyfin:10.9.11
imagePullPolicy: Always
name: jellyfin
ports:

View File

@ -10,7 +10,7 @@ helmCharts:
includeCRDs: true
namespace: node-feature-discovery
releaseName: node-feature-discovery
version: 0.15.1
version: 0.16.6
repo: https://kubernetes-sigs.github.io/node-feature-discovery/charts
valuesInLine:
master:

View File

@ -10,7 +10,7 @@ helmCharts:
includeCRDs: true
namespace: nvidia-device-plugin
releaseName: nvidia-device-plugin
version: 0.14.4
version: 0.17.0
repo: https://nvidia.github.io/k8s-device-plugin
valuesInline:
nodeSelector: "feature.node.kubernetes.io/pci-0300_10de_13c0_1569_13c0.present=true"

View File

@ -0,0 +1,17 @@
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: smb-combinedseries
provisioner: smb.csi.k8s.io
parameters:
source: "//172.20.0.70/series"
csi.storage.k8s.io/node-stage-secret-name: smb-creds
csi.storage.k8s.io/node-stage-secret-namespace: kube-system
reclaimPolicy: Retain
volumeBindingMode: Immediate
mountOptions:
- dir_mode=0777
- file_mode=0777
- uid=1001
- gid=1001
- noperm

View File

@ -4,10 +4,7 @@ metadata:
name: smb-music
provisioner: smb.csi.k8s.io
parameters:
source: "//hp40l/disk1"
subDir: flacstore
csi.storage.k8s.io/provisioner-secret-name: smb-creds
csi.storage.k8s.io/provisioner-secret-namespace: kube-system
source: "//172.20.0.69/flacstore"
csi.storage.k8s.io/node-stage-secret-name: smb-creds
csi.storage.k8s.io/node-stage-secret-namespace: kube-system
reclaimPolicy: Retain

View File

@ -4,12 +4,12 @@ metadata:
name: smb-oldmusic
provisioner: smb.csi.k8s.io
parameters:
source: "//hp40l/disk1"
source: "//172.20.0.126/data"
subDir: oldmusic
csi.storage.k8s.io/provisioner-secret-name: smb-creds
csi.storage.k8s.io/provisioner-secret-namespace: kube-system
csi.storage.k8s.io/node-stage-secret-name: smb-creds
csi.storage.k8s.io/node-stage-secret-namespace: kube-system
csi.storage.k8s.io/provisioner-secret-name: smb-creds
csi.storage.k8s.io/provisioner-secret-namespace: kube-system
reclaimPolicy: Retain
volumeBindingMode: Immediate
mountOptions:
@ -18,4 +18,3 @@ mountOptions:
- uid=1001
- gid=1001
- noperm
- user

View File

@ -34,8 +34,8 @@ spec:
name: data
- mountPath: /series
name: series
- mountPath: /oldseries
name: oldseries
- mountPath: /combinedseries
name: combinedseries
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
@ -47,9 +47,9 @@ spec:
- name: series
persistentVolumeClaim:
claimName: smb-series
- name: oldseries
- name: combinedseries
persistentVolumeClaim:
claimName: smb-oldseries
claimName: smb-combinedseries
- name: data
persistentVolumeClaim:
claimName: smb-usenet

View File

@ -13,14 +13,14 @@ spec:
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: smb-oldseries
name: smb-combinedseries
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 1Gi
storageClassName: smb-oldseries
storageClassName: smb-combinedseries
---
apiVersion: v1
kind: PersistentVolumeClaim

View File

@ -9,7 +9,6 @@ metadata:
app.kubernetes.io/version: 1.19.1
helm.sh/chart: zigbee2mqtt-9.4.2
name: zigbee2mqtt-settings
namespace: zigbee2mqtt
data:
configuration.yaml: |
advanced:

View File

@ -10,7 +10,6 @@ metadata:
annotations:
configmap.reloader.stakater.com/reload: "zigbee2mqtt-settings"
name: zigbee2mqtt
namespace: zigbee2mqtt
spec:
replicas: 1
revisionHistoryLimit: 3
@ -31,7 +30,6 @@ spec:
- command:
- /bin/sh
- -c
- cp /configs/configuration.yaml /data/;
- cp /configs/ledvanceA60S.js /data/;
image: alpine:latest
imagePullPolicy: IfNotPresent

View File

@ -6,6 +6,7 @@ spec:
accessModes:
- ReadWriteOnce
storageClassName: longhorn-fast
volumeName: pvc-ce3db1cb-42ef-4eb4-90e1-4bd212dfbf86
resources:
requests:
storage: 128Mi

View File

@ -0,0 +1 @@
1.33.2

View File

@ -0,0 +1,6 @@
#!/bin/bash
filename=$(date '+%Y%m%d%H%M%S').tgz
for i in $(talosctl -n 192.168.1.26 list /var/mnt/storage/zigbee2mqtt | grep 192.168 | tail -n 4 | awk '{print $2}'); do talosctl -n 192.168.1.26 read /var/mnt/storage/zigbee2mqtt/$i >$i; done
tar czf ${filename} $(talosctl -n 192.168.1.26 list /var/mnt/storage/zigbee2mqtt | grep 192.168 | tail -n 4 | awk '{print $2}' | xargs echo)
rm $(talosctl -n 192.168.1.26 list /var/mnt/storage/zigbee2mqtt | grep 192.168 | tail -n 4 | awk '{print $2}' | xargs echo)
echo copy to https://minio.service.consul/browser/backups/emlnYmVlMm1xdHQv

View File

@ -0,0 +1,80 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: zigbee2mqtt2
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: zigbee2mqtt
app.kubernetes.io/version: 1.19.1
helm.sh/chart: zigbee2mqtt-9.4.2
name: zigbee2mqtt-settings
data:
configuration.yaml: |
advanced:
homeassistant_discovery_topic: homeassistant
homeassistant_status_topic: homeassistant/status
last_seen: ISO_8601
log_level: debug
log_output:
- console
channel: 25
network_key:
- 140
- 18
- 129
- 36
- 87
- 2
- 242
- 222
- 178
- 205
- 177
- 160
- 9
- 212
- 115
- 122
experimental:
new_api: true
frontend:
port: 8080
homeassistant: true
serial:
port: 'tcp://ser2net.ser2net.svc.cluster.local:3001'
mqtt:
base_topic: zigbee2mqtt
include_device_information: true
server: 'mqtt://mosquitto.martyn.berlin'
permit_join: false
external_converters:
- ledvanceA60S.js
ledvanceA60S.js: |
const fz = require('zigbee-herdsman-converters/converters/fromZigbee');
const tz = require('zigbee-herdsman-converters/converters/toZigbee');
const exposes = require('zigbee-herdsman-converters/lib/exposes');
const reporting = require('zigbee-herdsman-converters/lib/reporting');
const extend = require('zigbee-herdsman-converters/lib/extend');
const ota = require('zigbee-herdsman-converters/lib/ota');
const tuya = require('zigbee-herdsman-converters/lib/tuya');
const e = exposes.presets;
const ea = exposes.access;
const definition = {
zigbeeModel: ['A60S RGBW'],
model: 'A60S RGBW',
vendor: 'Ledvance',
description: 'Ledvance Classic E27 Multicolor',
// Note that fromZigbee, toZigbee and exposes are missing here since we use extend here.
// Extend contains a default set of fromZigbee/toZigbee converters and expose for common device types.
// The following extends are available:
// - extend.switch
// - extend.light_onoff_brightness
// - extend.light_onoff_brightness_colortemp
// - extend.light_onoff_brightness_color
// - extend.light_onoff_brightness_colortemp_color
extend: extend.light_onoff_brightness_colortemp_color(),
};
module.exports = definition;

View File

@ -0,0 +1,95 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app.kubernetes.io/instance: zigbee2mqtt2
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: zigbee2mqtt
app.kubernetes.io/version: 1.19.1
helm.sh/chart: zigbee2mqtt-9.4.2
annotations:
configmap.reloader.stakater.com/reload: "zigbee2mqtt-settings"
name: zigbee2mqtt
spec:
replicas: 1
revisionHistoryLimit: 3
selector:
matchLabels:
app.kubernetes.io/instance: zigbee2mqtt
app.kubernetes.io/name: zigbee2mqtt
strategy:
type: Recreate
template:
metadata:
labels:
app.kubernetes.io/instance: zigbee2mqtt
app.kubernetes.io/name: zigbee2mqtt
spec:
automountServiceAccountToken: true
initContainers:
- command:
- /bin/sh
- -c
- cp /configs/ledvanceA60S.js /data/;
image: alpine:latest
imagePullPolicy: IfNotPresent
name: copy
volumeMounts:
- mountPath: /data
name: data
- mountPath: /configs/
name: zigbee2mqtt-settings
containers:
- env:
- name: ZIGBEE2MQTT_DATA
value: /data
image: koenkk/zigbee2mqtt:1.35.2
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
initialDelaySeconds: 0
periodSeconds: 10
tcpSocket:
port: 8080
timeoutSeconds: 1
name: zigbee2mqtt
ports:
- containerPort: 8080
name: http
protocol: TCP
readinessProbe:
failureThreshold: 3
initialDelaySeconds: 0
periodSeconds: 10
tcpSocket:
port: 8080
timeoutSeconds: 1
securityContext:
capabilities:
add:
- NET_ADMIN
- NET_RAW
- SYS_ADMIN
privileged: true
startupProbe:
failureThreshold: 30
initialDelaySeconds: 0
periodSeconds: 5
tcpSocket:
port: 8080
timeoutSeconds: 1
volumeMounts:
- mountPath: /data
name: data
dnsPolicy: ClusterFirstWithHostNet
enableServiceLinks: true
hostNetwork: true
serviceAccountName: default
volumes:
- configMap:
name: zigbee2mqtt-settings
name: zigbee2mqtt-settings
- name: data
persistentVolumeClaim:
claimName: zigbee2mqtt

View File

@ -0,0 +1,10 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: zigbee2mqtt2
resources:
- namespace.yaml
- configmap.yaml
- deploy.yaml
- pvc.yaml
- svc.yaml

View File

@ -0,0 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
labels:
name: zigbee2mqtt2
name: zigbee2mqtt2

View File

@ -0,0 +1,11 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: zigbee2mqtt
spec:
accessModes:
- ReadWriteOnce
storageClassName: longhorn-fast
resources:
requests:
storage: 128Mi

View File

@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
annotations:
external-dns.alpha.kubernetes.io/hostname: zigbee2.martyn.berlin
labels:
app.kubernetes.io/instance: zigbee2mqtt2
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: zigbee2mqtt
app.kubernetes.io/version: 1.19.1
helm.sh/chart: zigbee2mqtt-9.4.2
name: zigbee2mqtt
spec:
ports:
- port: 80
targetPort: 8080
selector:
app.kubernetes.io/instance: zigbee2mqtt
app.kubernetes.io/name: zigbee2mqtt
type: LoadBalancer

View File

@ -36,6 +36,8 @@ spec:
shares:
- oldseries-a
- moreoldseries
- evenmoreoldseries
- runningseries-b
- runningseries
extraPVCShares:
- name: films1
@ -53,9 +55,15 @@ spec:
- name: runningseries
size: 2Ti
storageClass: longhorn-spinny
- name: runningseries-b
size: 1Ti
storageClass: longhorn-spinny
- name: moreoldseries
size: 1Ti
storageClass: longhorn-spinny
- name: evenmoreoldseries
size: 1Ti
storageClass: longhorn-spinny
path: apps-helm/samba4
repoURL: https://git.martyn.berlin/martyn/infra4talos.git
targetRevision: HEAD

View File

@ -0,0 +1,17 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: zigbee2mqtt2
namespace: argocd
spec:
destination:
namespace: zigbee2mqtt2
server: https://kubernetes.default.svc
project: infra
source:
path: apps-kustomized/zigbee2mqtt2
repoURL: https://git.martyn.berlin/martyn/infra4talos
targetRevision: HEAD
syncPolicy:
automated:
selfHeal: true