From c285ae81afdb7cee5b85e92d24ec3903be63fe8b Mon Sep 17 00:00:00 2001 From: "Adrian A. Baumann" Date: Mon, 24 Nov 2025 15:20:31 +0100 Subject: [PATCH 1/2] Test with NFS --- argocd/001_pvc.yaml | 3 ++- argocd/deployment.yaml | 2 +- argocd/nfs-pv.yaml | 15 +++++++++++++++ argocd/nfs-storageclass.yaml | 12 ++++++++++++ .../templates/standards/standard_detail.html | 2 +- k8s/nfs-pv.yaml | 15 +++++++++++++++ k8s/nfs-storageclass.yaml | 12 ++++++++++++ k8s/pvc.yaml | 3 ++- pages/templates/base.html | 2 +- 9 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 argocd/nfs-pv.yaml create mode 100644 argocd/nfs-storageclass.yaml create mode 100644 k8s/nfs-pv.yaml create mode 100644 k8s/nfs-storageclass.yaml diff --git a/argocd/001_pvc.yaml b/argocd/001_pvc.yaml index 64cd70f..036c735 100644 --- a/argocd/001_pvc.yaml +++ b/argocd/001_pvc.yaml @@ -5,7 +5,8 @@ metadata: namespace: vorgabenui spec: accessModes: - - ReadWriteOnce + - ReadWriteMany + storageClassName: nfs resources: requests: storage: 2Gi diff --git a/argocd/deployment.yaml b/argocd/deployment.yaml index 795a518..1e71f44 100644 --- a/argocd/deployment.yaml +++ b/argocd/deployment.yaml @@ -25,7 +25,7 @@ spec: mountPath: /data containers: - name: web - image: git.baumann.gr/adebaumann/vui:0.955 + image: git.baumann.gr/adebaumann/vui:0.957 imagePullPolicy: Always ports: - containerPort: 8000 diff --git a/argocd/nfs-pv.yaml b/argocd/nfs-pv.yaml new file mode 100644 index 0000000..24a8a0d --- /dev/null +++ b/argocd/nfs-pv.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: django-data-pv + namespace: vorgabenui +spec: + capacity: + storage: 2Gi + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: Retain + storageClassName: nfs + nfs: + server: 192.168.17.199 + path: /mnt/user/vorgabenui/ \ No newline at end of file diff --git a/argocd/nfs-storageclass.yaml b/argocd/nfs-storageclass.yaml new file mode 100644 index 0000000..83d6577 --- /dev/null +++ b/argocd/nfs-storageclass.yaml @@ -0,0 +1,12 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: nfs +provisioner: kubernetes.io/no-provisioner +parameters: + server: 192.168.17.199 + path: /mnt/user/vorgabenui/ + readOnly: "false" +allowVolumeExpansion: true +reclaimPolicy: Retain +volumeBindingMode: Immediate \ No newline at end of file diff --git a/dokumente/templates/standards/standard_detail.html b/dokumente/templates/standards/standard_detail.html index 56f5ce2..f847591 100644 --- a/dokumente/templates/standards/standard_detail.html +++ b/dokumente/templates/standards/standard_detail.html @@ -25,7 +25,7 @@
-

Einleitung

+

Einleitung

{% for typ, html in standard.einleitung_html %} diff --git a/k8s/nfs-pv.yaml b/k8s/nfs-pv.yaml new file mode 100644 index 0000000..24a8a0d --- /dev/null +++ b/k8s/nfs-pv.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: django-data-pv + namespace: vorgabenui +spec: + capacity: + storage: 2Gi + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: Retain + storageClassName: nfs + nfs: + server: 192.168.17.199 + path: /mnt/user/vorgabenui/ \ No newline at end of file diff --git a/k8s/nfs-storageclass.yaml b/k8s/nfs-storageclass.yaml new file mode 100644 index 0000000..83d6577 --- /dev/null +++ b/k8s/nfs-storageclass.yaml @@ -0,0 +1,12 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: nfs +provisioner: kubernetes.io/no-provisioner +parameters: + server: 192.168.17.199 + path: /mnt/user/vorgabenui/ + readOnly: "false" +allowVolumeExpansion: true +reclaimPolicy: Retain +volumeBindingMode: Immediate \ No newline at end of file diff --git a/k8s/pvc.yaml b/k8s/pvc.yaml index 64cd70f..036c735 100644 --- a/k8s/pvc.yaml +++ b/k8s/pvc.yaml @@ -5,7 +5,8 @@ metadata: namespace: vorgabenui spec: accessModes: - - ReadWriteOnce + - ReadWriteMany + storageClassName: nfs resources: requests: storage: 2Gi diff --git a/pages/templates/base.html b/pages/templates/base.html index 603cf60..e0260ac 100644 --- a/pages/templates/base.html +++ b/pages/templates/base.html @@ -211,7 +211,7 @@

-

Version {{ version|default:"0.955" }}

+

Version {{ version|default:"0.957" }}

From 4376069b1181f1bac81269860e7e84ac47f226ce Mon Sep 17 00:00:00 2001 From: "Adrian A. Baumann" Date: Mon, 24 Nov 2025 15:37:12 +0100 Subject: [PATCH 2/2] NFS pointed to wrong place --- argocd/nfs-pv.yaml | 2 +- argocd/nfs-storageclass.yaml | 4 ---- k8s/nfs-pv.yaml | 2 +- k8s/nfs-storageclass.yaml | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/argocd/nfs-pv.yaml b/argocd/nfs-pv.yaml index 24a8a0d..fe679d1 100644 --- a/argocd/nfs-pv.yaml +++ b/argocd/nfs-pv.yaml @@ -12,4 +12,4 @@ spec: storageClassName: nfs nfs: server: 192.168.17.199 - path: /mnt/user/vorgabenui/ \ No newline at end of file + path: /mnt/user/vorgabenui \ No newline at end of file diff --git a/argocd/nfs-storageclass.yaml b/argocd/nfs-storageclass.yaml index 83d6577..1fb6d8a 100644 --- a/argocd/nfs-storageclass.yaml +++ b/argocd/nfs-storageclass.yaml @@ -3,10 +3,6 @@ kind: StorageClass metadata: name: nfs provisioner: kubernetes.io/no-provisioner -parameters: - server: 192.168.17.199 - path: /mnt/user/vorgabenui/ - readOnly: "false" allowVolumeExpansion: true reclaimPolicy: Retain volumeBindingMode: Immediate \ No newline at end of file diff --git a/k8s/nfs-pv.yaml b/k8s/nfs-pv.yaml index 24a8a0d..fe679d1 100644 --- a/k8s/nfs-pv.yaml +++ b/k8s/nfs-pv.yaml @@ -12,4 +12,4 @@ spec: storageClassName: nfs nfs: server: 192.168.17.199 - path: /mnt/user/vorgabenui/ \ No newline at end of file + path: /mnt/user/vorgabenui \ No newline at end of file diff --git a/k8s/nfs-storageclass.yaml b/k8s/nfs-storageclass.yaml index 83d6577..1fb6d8a 100644 --- a/k8s/nfs-storageclass.yaml +++ b/k8s/nfs-storageclass.yaml @@ -3,10 +3,6 @@ kind: StorageClass metadata: name: nfs provisioner: kubernetes.io/no-provisioner -parameters: - server: 192.168.17.199 - path: /mnt/user/vorgabenui/ - readOnly: "false" allowVolumeExpansion: true reclaimPolicy: Retain volumeBindingMode: Immediate \ No newline at end of file