deployment updates

docker-compose.yml

@@ -27,7 +27,7 @@ services:
       - "8080"
     volumes:
       - collected_static:/opt/collected_static
-      # - ./vb_django:/opt/app
+      - ./vb_django:/opt/app
 
   vb-dask-scheduler:
     restart: unless-stopped

k8s/vb-postgres-service.yml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: postgres
+  name: vb-postgres
   namespace: qed-kube-dev
 spec:
   type: ClusterIP

k8s/vb-pvcs.yml

@@ -0,0 +1,66 @@
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: vb-nginx-certs-pvc
+#   namespace: qed-kube-dev
+#   labels:
+#     app: vb-nginx-certs
+# spec:
+#   accessModes:
+#     - ReadWriteMany
+#   # storageClassName: vb-nginx-certs
+#   # storageClassName: hostpath
+#   resources:
+#     requests:
+#       storage: 1Gi  
+#   # volumeName: vb-nginx-certs-pv
+#   selector:
+#     matchLabels:
+#       release: "stable"
+#       name: vb-nginx-certs-pv
+
+# ---
+
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: vb-collected-static-pvc
+#   namespace: qed-kube-dev
+#   labels:
+#     app: vb-collected-static
+# spec:
+#   accessModes:
+#     - ReadWriteMany
+#   # storageClassName: vb-collected-static
+#   # storageClassName: hostpath
+#   resources:
+#     requests:
+#       storage: 1Gi
+#   # volumeName: vb-collected-static-pv
+#   selector:
+#     matchLabels:
+#       release: "stable"
+#       name: vb-collected-static-pv
+
+# ---
+
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: vb-postgres-pv-claim
+#   namespace: qed-kube-dev
+#   labels:
+#     app: vb-postgres
+# spec:
+#   accessModes:
+#     - ReadWriteMany
+#   # storageClassName: vb-postgres
+#   # storageClassName: hostpath
+#   # volumeName: vb-postgres-pv
+#   resources:
+#     requests:
+#       storage: 5Gi
+#   selector:
+#     matchLabels:
+#       release: "stable"
+#       name: "vb-postgres-pv"

k8s/vb-pvs.yml

@@ -0,0 +1,60 @@
+# apiVersion: v1
+# kind: PersistentVolume
+# metadata:
+#   name: vb-nginx-certs-pv
+#   labels:
+#     type: local
+#     app: vb-nginx-certs
+# spec:
+#   accessModes:
+#   - ReadWriteMany
+#   capacity:
+#     storage: 1Gi
+#   # storageClassName: hostpath
+#   # claimRef:
+#   #   name: vb-nginx-certs-pvc
+#   hostPath:
+#     # path: \D\\git\vb\nginx
+#     path: /run/desktop/mnt/host/c/Users/inick/GitHub/vb_kube/nginx_certs
+
+# ---
+
+# apiVersion: v1
+# kind: PersistentVolume
+# metadata:
+#   name: vb-collected-static-pv
+#   labels:
+#     type: local
+#     app: vb-collected-static
+# spec:
+#   accessModes:
+#   - ReadWriteMany
+#   capacity:
+#     storage: 1Gi
+#   # claimRef:
+#   #   name: vb-collected-static-pvc
+#   # storageClassName: hostpath
+#   hostPath:
+#     # path: \D\\git\vb\collected_static
+#     path: /run/desktop/mnt/host/c/Users/inick/GitHub/vb_kube/collected_static
+
+# ---
+
+# apiVersion: v1
+# kind: PersistentVolume
+# metadata:
+#   name: vb-postgres-pv
+#   labels:
+#     type: local
+#     app: vb-postgres
+# spec:
+#   # storageClassName: hostpath
+#   capacity:
+#     storage: 5Gi
+#   accessModes:
+#     - ReadWriteMany
+#   # claimRef:
+#   #   name: vb-postgres-pvc
+#   hostPath:
+# #    path: /host/app_data
+#     path: /run/desktop/mnt/host/c/Users/inick/GitHub/vb_kube/app_data

vb_nginx/nginx.conf

@@ -21,7 +21,11 @@ server {
         alias /src/collected_static/vb/;
     }
     location /vb/assets/ {
-        alias /src/collected_static/vb/;
+        alias /src/collected_static/vb/assets/;
+    }
+
+    location /assets/ {
+        alias /src/collected_static/vb/assets/;
     }
 
     location / {