From 66b326ef6988ed962e8590017f176a28cd13ee56 Mon Sep 17 00:00:00 2001
From: Lucas ONeil <lucasoneil@gmail.com>
Date: Wed, 11 Oct 2023 20:31:49 -0700
Subject: [PATCH 01/10] res login

Signed-off-by: Lucas ONeil <lucasoneil@gmail.com>
---
 deploy/traction/values-pr.yaml                      |  2 +-
 .../tenant-ui/frontend/src/components/Login.vue     | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/deploy/traction/values-pr.yaml b/deploy/traction/values-pr.yaml
index 38e7d85d0..15d7d3195 100644
--- a/deploy/traction/values-pr.yaml
+++ b/deploy/traction/values-pr.yaml
@@ -52,7 +52,7 @@ tenant_proxy:
       namespaceSelector:
         network.openshift.io/policy-group: ingress
 ui:
-  showOIDCReservationLogin: false
+  showOIDCReservationLogin: true
   image:
     pullPolicy: Always
   oidc:
diff --git a/services/tenant-ui/frontend/src/components/Login.vue b/services/tenant-ui/frontend/src/components/Login.vue
index 38a1cb574..02ecb6e7b 100644
--- 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';

From 09dc97717d36ad3535e9853d50fac12d08fc2636 Mon Sep 17 00:00:00 2001
From: Lucas ONeil <lucasoneil@gmail.com>
Date: Wed, 11 Oct 2023 20:52:10 -0700
Subject: [PATCH 02/10] Flip toggle

Signed-off-by: Lucas ONeil <lucasoneil@gmail.com>
---
 deploy/traction/values-pr.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/traction/values-pr.yaml b/deploy/traction/values-pr.yaml
index 15d7d3195..38e7d85d0 100644
--- a/deploy/traction/values-pr.yaml
+++ b/deploy/traction/values-pr.yaml
@@ -52,7 +52,7 @@ tenant_proxy:
       namespaceSelector:
         network.openshift.io/policy-group: ingress
 ui:
-  showOIDCReservationLogin: true
+  showOIDCReservationLogin: false
   image:
     pullPolicy: Always
   oidc:

From 49d01e19b3e75aac12d9b8e76bea98b5a753b655 Mon Sep 17 00:00:00 2001
From: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
Date: Thu, 12 Oct 2023 09:15:52 -0700
Subject: [PATCH 03/10] tune autoscaling defaults

Signed-off-by: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
---
 charts/traction/values.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml
index 6b0a1e9c8..67b09b7ef 100644
--- 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
@@ -461,7 +461,7 @@ tenant_proxy:
   autoscaling:
     enabled: false
     minReplicas: 1
-    maxReplicas: 5
+    maxReplicas: 3
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
     stabilizationWindowSeconds: 300
@@ -724,7 +724,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

From eaa367cd10f702aa220b11672cac2302e693386d Mon Sep 17 00:00:00 2001
From: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
Date: Thu, 12 Oct 2023 09:18:00 -0700
Subject: [PATCH 04/10] tune acapy resource requests and limits

Signed-off-by: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
---
 charts/traction/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml
index 67b09b7ef..43bbf12a3 100644
--- a/charts/traction/values.yaml
+++ b/charts/traction/values.yaml
@@ -281,10 +281,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: {}

From 794d76b56911f98ba71d5db5b75bf73c0f6f5192 Mon Sep 17 00:00:00 2001
From: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
Date: Thu, 12 Oct 2023 09:18:40 -0700
Subject: [PATCH 05/10] tune proxy resource requests and limits

Signed-off-by: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
---
 charts/traction/values.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml
index 43bbf12a3..3657a4d4a 100644
--- a/charts/traction/values.yaml
+++ b/charts/traction/values.yaml
@@ -532,11 +532,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
 

From 0ac49af8b951deb0b81320af80bb72159e2d610b Mon Sep 17 00:00:00 2001
From: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
Date: Thu, 12 Oct 2023 09:18:49 -0700
Subject: [PATCH 06/10] tune ui resource requests and limits

Signed-off-by: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
---
 charts/traction/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml
index 3657a4d4a..5e45e4d74 100644
--- a/charts/traction/values.yaml
+++ b/charts/traction/values.yaml
@@ -706,10 +706,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

From a11bc79915c06661481a537c750d95c2edad9397 Mon Sep 17 00:00:00 2001
From: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
Date: Thu, 12 Oct 2023 09:27:51 -0700
Subject: [PATCH 07/10] tune postgres default resource requests and limits

Signed-off-by: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
---
 charts/traction/values.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml
index 5e45e4d74..acc766f08 100644
--- a/charts/traction/values.yaml
+++ b/charts/traction/values.yaml
@@ -860,11 +860,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:

From e39535a2eeaf4a6ffb5371eb3e9883742366cd81 Mon Sep 17 00:00:00 2001
From: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
Date: Thu, 12 Oct 2023 09:37:20 -0700
Subject: [PATCH 08/10] tune dev resources and autoscaling

Signed-off-by: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
---
 deploy/traction/values-development.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/deploy/traction/values-development.yaml b/deploy/traction/values-development.yaml
index 20e43548b..6318ec9fd 100644
--- 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:
@@ -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

From 89f416d94baa837082b66d4989b3051494f0ddaa Mon Sep 17 00:00:00 2001
From: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
Date: Thu, 12 Oct 2023 09:37:37 -0700
Subject: [PATCH 09/10] tune pr resource requests and limits

Signed-off-by: Ivan Polchenko <2119240+i5okie@users.noreply.github.com>
---
 deploy/traction/values-pr.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/deploy/traction/values-pr.yaml b/deploy/traction/values-pr.yaml
index 38e7d85d0..dcc41aa4c 100644
--- 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'neil@gov.bc.ca
   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

From 3deb6fd9f62298980014aa95e5e8b758a6feea3d Mon Sep 17 00:00:00 2001
From: Lucas ONeil <lucasoneil@gmail.com>
Date: Thu, 12 Oct 2023 10:27:55 -0700
Subject: [PATCH 10/10] enable in dev

Signed-off-by: Lucas ONeil <lucasoneil@gmail.com>
---
 deploy/traction/values-development.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/traction/values-development.yaml b/deploy/traction/values-development.yaml
index 20e43548b..9c0f3bc32 100644
--- a/deploy/traction/values-development.yaml
+++ b/deploy/traction/values-development.yaml
@@ -44,7 +44,7 @@ tenant_proxy:
       namespaceSelector:
         network.openshift.io/policy-group: ingress
 ui:
-  showOIDCReservationLogin: false
+  showOIDCReservationLogin: true
   image:
     pullPolicy: Always
   oidc: