few fixes

bcgov · Mar 13, 2024 · 3efeb0a · 3efeb0a
1 parent a4672a6
commit 3efeb0a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 12 deletions.
diff --git a/infrastructure/_django/templates/django-deployment.yaml b/infrastructure/_django/templates/django-deployment.yaml
@@ -20,7 +20,7 @@ spec:
       volumes:
         - name: django-media-volume
           persistentVolumeClaim:
-            claimName: {{ include "app.fullname" . }}-cms-media
+            claimName: {{ include "app.fullname" . }}
         - name: django-app-images-volume
           persistentVolumeClaim:
             claimName: {{ include "app.fullname" . }}-app-images

diff --git a/infrastructure/_django/templates/django-pvc.yaml b/infrastructure/_django/templates/django-pvc.yaml
@@ -1,7 +1,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "app.fullname" . }}-cms-media
+  name: {{ template "app.fullname" . }}
   labels: {{ include "app.labels" . | nindent 4 }}
 spec:
   accessModes:

diff --git a/infrastructure/_django/values.yaml b/infrastructure/_django/values.yaml
@@ -29,8 +29,11 @@ autoscaling:
 route:
   host: drivebc.apps.silver.devops.gov.bc.ca
   iprestricted: false #Set to true if you want to limit IP's the the addresses in the ipallowlist below
+  iprestrictedAdminPages: true
   ipallowlist: 142.34.53.0/24 142.22.0.0/15 142.24.0.0/13 142.32.0.0/13 208.181.128.46/32 #The first 4 ranges are GOV IP's, the last one is for OXD external IP
 
-pvc:
-  port: 3000
+mediapvc:
   storage: 1Gi
+
+apppvc:
+  storage: 2Gi
diff --git a/infrastructure/_static/templates/static-deployment.yaml b/infrastructure/_static/templates/static-deployment.yaml
@@ -36,6 +36,7 @@ spec:
           volumeMounts:
             - name: django-app-images-volume
               mountPath: /app/images/webcams
+              readOnly: true
           image: >-
             {{ .Values.image.repository  }}:{{ .Values.image.tag  }}
           env:

diff --git a/infrastructure/main/values-dev.yaml b/infrastructure/main/values-dev.yaml
@@ -114,6 +114,9 @@ static:
     env:
       staticConfigMap: dev-drivebc-static
       staticSecret: dev-drivebc-static
+    volumes:
+      claimName: dev-django-app-images
+
   autoscaling:
     enabled: true
     minReplicas: 1

diff --git a/infrastructure/main/values-prod.yaml b/infrastructure/main/values-prod.yaml
@@ -114,8 +114,8 @@ static:
     env:
       staticConfigMap: prod-drivebc-static
       staticSecret: prod-drivebc-static
-  volumes:
-    claimName: prod-django-app-images
+    volumes:
+      claimName: prod-django-app-images
   autoscaling:
     enabled: true
     minReplicas: 3

diff --git a/infrastructure/main/values-test.yaml b/infrastructure/main/values-test.yaml
@@ -114,8 +114,8 @@ static:
     env:
       staticConfigMap: test-drivebc-static
       staticSecret: test-drivebc-static
-  volumes:
-    claimName: test-django-app-images
+    volumes:
+      claimName: test-django-app-images
   autoscaling:
     enabled: true
     minReplicas: 1

diff --git a/infrastructure/main/values-uat.yaml b/infrastructure/main/values-uat.yaml
@@ -114,8 +114,8 @@ static:
     env:
       staticConfigMap: uat-drivebc-static
       staticSecret: uat-drivebc-static
-  volumes:
-    claimName: uat-django-app-images
+    volumes:
+      claimName: uat-django-app-images
   autoscaling:
     enabled: true
     minReplicas: 3

diff --git a/infrastructure/main/values.yaml b/infrastructure/main/values.yaml
@@ -112,8 +112,8 @@ static:
         memory: 100Mi
     env:
       staticConfigMap: drivebc-static
-  volumes:
-    claimName: django-app-images
+    volumes:
+      claimName: django-app-images
   autoscaling:
     enabled: true
     minReplicas: 1