Merge branch 'main' into fix/chart-db-connection

bcgov · Oct 12, 2023 · f576ac4 · f576ac4
2 parents 76c9cf4 + a82a28f
commit f576ac4
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 34 deletions.
diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml
@@ -48,7 +48,7 @@ acapy:
   autoscaling:
     enabled: false
     minReplicas: 1
-    maxReplicas: 10
+    maxReplicas: 3
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
     stabilizationWindowSeconds: 300
@@ -284,10 +284,10 @@ acapy:
   resources:
     limits:
       cpu: 300m
-      memory: 512Mi
+      memory: 300Mi
     requests:
       cpu: 120m
-      memory: 128Mi
+      memory: 200Mi
   ## @param acapy.podAnnotations Map of annotations to add to the acapy pods
   ##
   podAnnotations: {}
@@ -464,7 +464,7 @@ tenant_proxy:
   autoscaling:
     enabled: false
     minReplicas: 1
-    maxReplicas: 5
+    maxReplicas: 3
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
     stabilizationWindowSeconds: 300
@@ -535,11 +535,11 @@ tenant_proxy:
   ##
   resources:
     limits:
-      cpu: 250m
-      memory: 256Mi
+      cpu: 100m
+      memory: 50Mi
     requests:
-      cpu: 125m
-      memory: 128Mi
+      cpu: 10m
+      memory: 50Mi
 
   ## @section Tenant Proxy NetworkPolicy parameters
 
@@ -709,10 +709,10 @@ ui:
   resources:
     limits:
       cpu: 300m
-      memory: 256Mi
+      memory: 128Mi
     requests:
       cpu: 10m
-      memory: 16Mi
+      memory: 80Mi
   ## @param ui.replicaCount Number of tenant-ui replicas to deploy. Ignored if autoscaling is enabled.
   ##
   replicaCount: 1
@@ -727,7 +727,7 @@ ui:
   autoscaling:
     enabled: false
     minReplicas: 1
-    maxReplicas: 5
+    maxReplicas: 3
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
   ## @param ui.nodeSelector Node labels for tenant-ui pods assignment
@@ -863,11 +863,11 @@ postgresql:
     ##
     resources:
       limits:
-        cpu: 600m
-        memory: 2600Mi
+        cpu: 500m
+        memory: 500Mi
       requests:
-        cpu: 300m
-        memory: 1300Mi
+        cpu: 100m
+        memory: 100Mi
     ## @param postgresql.primary.service.ports.postgresql PostgreSQL service port
     ##
     service:

diff --git a/deploy/traction/values-development.yaml b/deploy/traction/values-development.yaml
@@ -25,7 +25,7 @@ acapy:
   autoscaling:
     enabled: true
     minReplicas: 2
-    maxReplicas: 5
+    maxReplicas: 3
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
   networkPolicy:
@@ -44,7 +44,7 @@ tenant_proxy:
       namespaceSelector:
         network.openshift.io/policy-group: ingress
 ui:
-  showOIDCReservationLogin: false
+  showOIDCReservationLogin: true
   image:
     pullPolicy: Always
   oidc:
@@ -67,7 +67,7 @@ ui:
   autoscaling:
     enabled: true
     minReplicas: 2
-    maxReplicas: 5
+    maxReplicas: 3
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
 ingress:
@@ -76,8 +76,8 @@ ingress:
 postgresql:
   resources:
     limits:
-      cpu: 400m
-      memory: 1600Mi
+      cpu: 500m
+      memory: 500Mi
     requests:
-      cpu: 200m
-      memory: 820Mi
+      cpu: 100m
+      memory: 100Mi
diff --git a/deploy/traction/values-pr.yaml b/deploy/traction/values-pr.yaml
@@ -32,7 +32,7 @@ acapy:
   resources:
     limits:
       cpu: 200m
-      memory: 512Mi
+      memory: 300Mi
     requests:
       cpu: 120m
       memory: 128Mi
@@ -68,11 +68,11 @@ ui:
     innkeeperInbox: lucas.o'[email protected]
   resources:
     limits:
-      cpu: 200m
-      memory: 820Mi
+      cpu: 300m
+      memory: 128Mi
     requests:
-      cpu: 120m
-      memory: 400Mi
+      cpu: 10m
+      memory: 80Mi
   ingress:
     annotations:
       route.openshift.io/termination: edge
@@ -90,7 +90,7 @@ postgresql:
     resources:
       limits:
         cpu: 200m
-        memory: 820Mi
+        memory: 128Mi
       requests:
-        cpu: 120m
-        memory: 400Mi
+        cpu: 100m
+        memory: 50Mi
diff --git a/services/tenant-ui/frontend/src/components/Login.vue b/services/tenant-ui/frontend/src/components/Login.vue
@@ -15,7 +15,9 @@
         <div v-if="loginMode === LOGIN_MODE.SIGNIN" class="pt-6">
           <LoginForm />
           <div
-            v-if="config.frontend.showOIDCReservationLogin"
+            v-if="
+              stringOrBooleanTruthy(config.frontend.showOIDCReservationLogin)
+            "
             class="oidc-login"
           >
             <hr />
@@ -27,8 +29,8 @@
 
           <div
             v-if="
-              (config.frontend.showOIDCReservationLogin && user) ||
-              !config.frontend.showOIDCReservationLogin
+              user ||
+              !stringOrBooleanTruthy(config.frontend.showOIDCReservationLogin)
             "
             class="mt-6"
           >
@@ -77,7 +79,9 @@
         </div>
 
         <!-- Show OIDC user if logged in -->
-        <div v-if="config.frontend.showOIDCReservationLogin">
+        <div
+          v-if="stringOrBooleanTruthy(config.frontend.showOIDCReservationLogin)"
+        >
           <div class="flex justify-content-end mt-4">
             <OidcUserDisplayVue />
           </div>
@@ -109,6 +113,7 @@ import OidcUserDisplayVue from './reservation/user/OidcUserDisplay.vue';
 import Reserve from './reservation/Reserve.vue';
 import Status from './reservation/Status.vue';
 import SessionTimeoutModal from './common/SessionTimeoutModal.vue';
+import { stringOrBooleanTruthy } from '@/helpers';
 // State
 import { storeToRefs } from 'pinia';
 import { useConfigStore, useReservationStore, useOidcStore } from '@/store';