Merge pull request #73 from WadeBarnes/feature/update-success-page

Incorporate additional feedback into success page

edivorce/apps/core/templates/success.html

@@ -12,15 +12,15 @@
 
 <div class="success-buttons">
     <div class="flex-row" id="bcId" style="width: 30%;">
-        <h3>Register for a Basic BCeID</h3>
+        <h3>Register for a <br>Basic BCeID</br></h3>
         <p>Once you register, you’ll be taken back to this website.</p>
     </div>
     <div class="flex-row" id="scard" style="width: 30%;">
-        <h3>Set up your BC Services Card Account</h3>
+        <h3>Set up your <br>BC Services Card</br></h3>
         <p>Once you're set up, you’ll be taken back to this website.</p>
     </div>
     <div class="flex-row" id="login" style="width: 30%;">
-        <h3>Login with a BCeID or BC Services Card</h3>
+        <h3>Login with a <br>BCeID or BC Services Card</br></h3>
         <p>Once you login, you’ll be taken back to this website.</p>
 
     </div>

openshift/templates/edivorce-django/edivorce-django-build.yaml

@@ -44,6 +44,13 @@ objects:
     - type: ConfigChange
     postCommit:
       script: "./manage.py test"
+    resources:
+      limits:
+        cpu: ${CPU_LIMIT}
+        memory: ${MEMORY_LIMIT}
+      requests:
+        cpu: ${CPU_REQUEST}
+        memory: ${MEMORY_REQUEST}
 parameters:
 - name: NAME
   displayName: Name
@@ -85,3 +92,24 @@ parameters:
   displayName: Custom PyPi Index URL
   description: The custom PyPi index URL
   value: ''
+# ===============================================================================
+- name: CPU_REQUEST
+  displayName: Resources CPU Request
+  description: The resources CPU request (in cores) for this build.
+  required: true
+  value: 10m
+- name: CPU_LIMIT
+  displayName: Resources CPU Limit
+  description: The resources CPU limit (in cores) for this build.
+  required: true
+  value: 750m
+- name: MEMORY_REQUEST
+  displayName: Resources Memory Request
+  description: The resources Memory request (in Mi, Gi, etc) for this build.
+  required: true
+  value: 10Mi
+- name: MEMORY_LIMIT
+  displayName: Resources Memory Limit
+  description: The resources Memory limit (in Mi, Gi, etc) for this build.
+  required: true
+  value: 1000Mi

openshift/templates/edivorce-django/edivorce-django-deploy.yaml

@@ -65,7 +65,7 @@ objects:
               port: 8080
           livenessProbe:
             timeoutSeconds: 3
-            initialDelaySeconds: 30
+            initialDelaySeconds: 60
             httpGet:
               path: "/health"
               port: 8080
@@ -112,7 +112,11 @@ objects:
                 name: ${NAME}
           resources:
             limits:
-              memory: "${MEMORY_LIMIT}"
+              cpu: ${CPU_LIMIT}
+              memory: ${MEMORY_LIMIT}
+            requests:
+              cpu: ${CPU_REQUEST}
+              memory: ${MEMORY_REQUEST}
 - kind: Secret
   apiVersion: v1
   metadata:
@@ -197,8 +201,24 @@ parameters:
   description: Basic Auth Password. Needs to be basee64 encoded.
   generate: expression
   from: "[a-zA-Z0-9]{16}"
+# ===============================================================================
+- name: CPU_REQUEST
+  displayName: Resources CPU Request
+  description: The resources CPU request (in cores) for this build.
+  required: true
+  value: 10m
+- name: CPU_LIMIT
+  displayName: Resources CPU Limit
+  description: The resources CPU limit (in cores) for this build.
+  required: true
+  value: 500m
+- name: MEMORY_REQUEST
+  displayName: Resources Memory Request
+  description: The resources Memory request (in Mi, Gi, etc) for this build.
+  required: true
+  value: 10Mi
 - name: MEMORY_LIMIT
-  displayName: Memory Limit
+  displayName: Resources Memory Limit
+  description: The resources Memory limit (in Mi, Gi, etc) for this build.
   required: true
-  description: Maximum amount of memory the Django container can use.
-  value: 512Mi
+  value: 512Mi