Merge branch 'develop' into test

bcgov · Jun 14, 2024 · db84f47 · db84f47
2 parents 7bd5baf + 41dcc9b
commit db84f47
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -193,5 +193,4 @@ jobs:
             -p WEB_PORT=8080 \
             -p HPR_URL=healthpractitionerregistration.apps.silver.devops.gov.bc.ca \
             -p MAUTH_URL=prod-mauth-${{secrets.OPENSHIFT_LICENSE_PLATE}}-prod.apps.silver.devops.gov.bc.ca \
-            -p DOCMAN_VOLUME_CAPACITY=7Gi \
             -n ${{secrets.OPENSHIFT_LICENSE_PLATE}}-${{secrets.OPENSHIFT_ENVIRONMENT}} | oc apply -n ${{secrets.OPENSHIFT_LICENSE_PLATE}}-${{secrets.OPENSHIFT_ENVIRONMENT}} -f -
diff --git a/documentation/compositions/yaml/document-manager-pvc.yaml b/documentation/compositions/yaml/document-manager-pvc.yaml
@@ -0,0 +1,14 @@
+#   Document Manager (backend) Persistent Volume Claim
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    name: ${SVC_NAME}-document-manager-pvc
+    namespace: ${OC_LICENSE_PLATE}-${OC_ENV}
+    labels:
+      app.kubernetes.io/part-of: ${SVC_NAME}
+  spec:
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: 8Gi
diff --git a/infrastructure/prime-app-template.yml b/infrastructure/prime-app-template.yml
@@ -44,11 +44,6 @@ parameters:
   description: Development or Production
   required: true
   value: Development
-- name: DOCMAN_VOLUME_CAPACITY
-  displayName: Document Manager Persistent Volume Capacity
-  description: Volume space available for Document Manager Backend data e.g. 512Mi, 2Gi.
-  required: true
-  value: 5Gi
 - name: WEB_PORT
   displayName: Web Port for NGINX
   description: Termination port on NGINX (8080 or 8443)
@@ -1037,20 +1032,6 @@ objects:
         targetPort: 6001
     selector:
       name: ${SVC_NAME}-document-manager
-#   Document Manager (backend) Persistent Volume Claim
-- apiVersion: v1
-  kind: PersistentVolumeClaim
-  metadata:
-    name: ${SVC_NAME}-document-manager-pvc
-    namespace: ${OC_LICENSE_PLATE}-${OC_ENV}
-    labels:
-      app.kubernetes.io/part-of: ${SVC_NAME}
-  spec:
-    accessModes:
-      - ReadWriteOnce
-    resources:
-      requests:
-        storage: ${DOCMAN_VOLUME_CAPACITY}
 
 ###########################################
 ###                Redis                ###
@@ -1159,3 +1140,19 @@ objects:
         targetPort: 6379
     selector:
       name: ${SVC_NAME}-redis
+
+
+#   Document Manager (backend) Persistent Volume Claim
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    name: ${SVC_NAME}-document-manager-pvc
+    namespace: ${OC_LICENSE_PLATE}-${OC_ENV}
+    labels:
+      app.kubernetes.io/part-of: ${SVC_NAME}
+  spec:
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: ${DOCMAN_VOLUME_CAPACITY}