bump

erebe · Jun 5, 2024 · bb5a338 · bb5a338
1 parent bd18aab
commit bb5a338
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -27,6 +27,7 @@ dns:
 	sops -d --output secrets_decrypted/gandi.yml secrets/gandi.yml
 	GANDI_CONFIG='secrets_decrypted/gandi.yml' gandi dns update erebe.eu -f dns/erebe.eu.zones
 	GANDI_CONFIG='secrets_decrypted/gandi.yml' gandi dns update erebe.dev -f dns/erebe.dev.zones
+	GANDI_CONFIG='secrets_decrypted/gandi.yml' gandi dns update erebe.eus -f dns/erebe.eus.zones
 
 
 k8s:
@@ -44,6 +45,8 @@ k8s:
            --version v0.2.0 \
            --namespace cert-manager \
 					 -f k8s/cert-manager-webhook-gandi.yaml
+	helm repo add nfs-subdir-external-provisioner https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/
+	helm upgrade --install nfs-subdir-external-provisioner nfs-subdir-external-provisioner/nfs-subdir-external-provisioner -f k8s/nfs-subdir-values.yaml
 
 
 

diff --git a/dns/erebe.eu.zones b/dns/erebe.eu.zones
@@ -54,17 +54,3 @@ warp 10800 IN AAAA 2a01:4f8:c013:7b8::1
 *.warp 10800 IN A 49.13.58.9
 *.warp 10800 IN AAAA 2a01:4f8:c013:7b8::1
 cafe 10800 IN AAAA 2a01:4f8:c013:7b8::cafe
-
-
-router.lan 10800 IN A 10.200.0.1
-router.lan 10800 IN AAAA fd00:cafe::1
-pihole.lan 10800 IN A 10.200.0.2
-pihole.lan 10800 IN AAAA fd00:cafe::2
-k8s.lan 10800 IN A 10.200.0.3
-k8s.lan 10800 IN AAAA fd00:cafe::3
-toybox.lan 10800 IN A 10.200.0.4
-toybox.lan 10800 IN AAAA fd00:cafe::4
-mail.lan 10800 IN A 10.200.0.5
-mail.lan 10800 IN AAAA fd00:cafe::5
-s3.lan 10800 IN A 10.200.0.6
-s3.lan 10800 IN AAAA fd00:cafe::6
diff --git a/dns/erebe.eus.zones b/dns/erebe.eus.zones
@@ -0,0 +1,17 @@
+@ 10800 IN SOA ns1.gandi.net. hostmaster.gandi.net. 1579092697 10800 3600 604800 10800
+@ IN CAA 0 issue "letsencrypt.org"
+@ IN CAA 0 issuewild "letsencrypt.org"
+router 10800 IN A 10.200.0.1
+router 10800 IN AAAA fd00:cafe::1
+pihole 10800 IN A 10.200.0.2
+pihole 10800 IN AAAA fd00:cafe::2
+k8s 10800 IN A 10.200.0.3
+k8s 10800 IN AAAA fd00:cafe::3
+toybox 10800 IN A 10.200.0.4
+toybox 10800 IN AAAA fd00:cafe::4
+mail 10800 IN A 10.200.0.5
+mail 10800 IN AAAA fd00:cafe::5
+s3 10800 IN A 10.200.0.6
+s3 10800 IN AAAA fd00:cafe::6
+proxmox 10800 IN A 10.200.0.7
+proxmox 10800 IN AAAA fd00:cafe::7
diff --git a/nodes/k3s/k3s/nfs-subdir-values.yaml → k8s/nfs-subdir-values.yaml b/nodes/k3s/k3s/nfs-subdir-values.yaml → k8s/nfs-subdir-values.yaml
diff --git a/nodes/k3s/justfile b/nodes/k3s/justfile
@@ -18,12 +18,6 @@ package:
   ssh {{HOST}} "curl -L https://github.com/cilium/cilium-cli/releases/download/v0.15.5/cilium-linux-amd64.tar.gz | tar xzvf - cilium"
   ssh {{HOST}} "curl -L https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_amd64.tar.gz | tar xzvf - k9s"
 
-nfs:
-  rsync --rsync-path="sudo rsync" k3s/nfs-subdir-values.yaml {{HOST}}:.
-  ssh {{HOST}} "helm repo add nfs-subdir-external-provisioner https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/"
-  ssh {{HOST}} "helm upgrade --install nfs-subdir-external-provisioner nfs-subdir-external-provisioner/nfs-subdir-external-provisioner -f nfs-subdir-values.yaml"
-
-
 k3s:
   ssh {{HOST}} "sudo mkdir -p /etc/rancher/k3s"
   rsync --rsync-path="sudo rsync" k3s/config.yaml {{HOST}}:/etc/rancher/k3s/config.yaml

diff --git a/services/app/couber.yml b/services/app/couber.yml
@@ -22,10 +22,14 @@ spec:
       - key: "kubernetes.io/hostname"
         operator: "Equal"
         value: "toybox"
+      securityContext:
+        fsGroup: 1000
+        fsGroupChangePolicy: "OnRootMismatch"
       containers:
       - name: couber
         image: ghcr.io/erebe/couber:latest
         imagePullPolicy: Always
+        args: ["runuser", "-u", "app", "./couber"]
         env:
         - name: PORT
           value: "8081"
@@ -34,7 +38,7 @@ spec:
         volumeMounts:
         - name: db
           mountPath: /home/app/db
-        - name: videos
+        - name: videos2
           mountPath: /home/app/videos
       volumes:
       - name: db
@@ -45,7 +49,21 @@ spec:
         hostPath:
           path: /opt/couber/videos/
           type: Directory
-
+      - name: videos2
+        persistentVolumeClaim:
+          claimName: couber-pv-claim
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: couber-pv-claim
+spec:
+  storageClassName: nfs-nvme
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 20Gi
 ---
 apiVersion: v1
 kind: Service