Compare commits
29 Commits
renovate/e
...
main
Author | SHA1 | Date |
---|---|---|
Martyn | 543aa20d9f | |
Martyn | 1bcb250284 | |
Martyn | 1bf04a6d88 | |
Martyn | 4cc335199c | |
Martyn | aecbdfd3b2 | |
Martyn | f21201c330 | |
Martyn | 1a69ffc2eb | |
Martyn | aae5e0b6c7 | |
Renovate bot | db46dbff82 | |
Renovate bot | a95d6096d5 | |
Martyn | d598aa415a | |
Martyn | 169d16eca3 | |
Martyn | 7dc56b0174 | |
Martyn | c4f5a81b7a | |
Martyn | 5a175191d1 | |
Renovate bot | 069489e9b3 | |
Martyn | cc5be09855 | |
Martyn | e3249bfe6a | |
Martyn | 69f09df8fd | |
Martyn | 29085e1eca | |
Martyn | fce4e2b9f3 | |
Martyn | a3762bc496 | |
Renovate bot | ef8d0fa981 | |
Renovate bot | 81dcb12c63 | |
Martyn | 86a6efa378 | |
Renovate bot | 031d22edfd | |
Martyn | a4aafb92a6 | |
Martyn | bf4afb03d1 | |
Renovate bot | 5dbf1bb1d7 |
|
@ -6,7 +6,7 @@ replicaCount: 1
|
|||
|
||||
image:
|
||||
repository: codercom/code-server
|
||||
tag: '4.8.0'
|
||||
tag: '4.93.1'
|
||||
pullPolicy: Always
|
||||
|
||||
secret:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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: ""
|
||||
|
|
|
@ -4,7 +4,7 @@ kind: Kustomization
|
|||
helmCharts:
|
||||
- name: external-dns
|
||||
repo: https://charts.bitnami.com/bitnami
|
||||
version: 6.38.0
|
||||
version: 6.28.4
|
||||
releaseName: external-dns
|
||||
namespace: external-dns
|
||||
valuesInline:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,6 +6,7 @@ spec:
|
|||
accessModes:
|
||||
- ReadWriteOnce
|
||||
storageClassName: longhorn-fast
|
||||
volumeName: pvc-ce3db1cb-42ef-4eb4-90e1-4bd212dfbf86
|
||||
resources:
|
||||
requests:
|
||||
storage: 128Mi
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
1.33.2
|
|
@ -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
|
|
@ -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;
|
|
@ -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
|
||||
|
|
@ -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
|
|
@ -0,0 +1,6 @@
|
|||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
labels:
|
||||
name: zigbee2mqtt2
|
||||
name: zigbee2mqtt2
|
|
@ -0,0 +1,11 @@
|
|||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: zigbee2mqtt
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
storageClassName: longhorn-fast
|
||||
resources:
|
||||
requests:
|
||||
storage: 128Mi
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue