bcgov · WadeBarnes · Nov 28, 2022 · Dec 16, 2022
diff --git a/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.dev.param b/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.dev.param
@@ -29,6 +29,8 @@ TAG_NAME=dev
 # GENESIS_FILE_URL=https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis
 ACAPY_LABEL=BC Mediator (Dev)
 ACAPY_INVITE_LABEL=BC Wallet Service (Dev)
+LOG_LEVEL=DEBUG
+# SESSION_AFFINITY=ClientIP
 # MIN_REPLICAS=3
 # MAX_REPLICAS=6
 # CPU_REQUEST=10m

diff --git a/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.param b/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.param
@@ -29,6 +29,8 @@ AGENT_WS_URL=wss://aries-mediator-agent-dev.apps.silver.devops.gov.bc.ca
 GENESIS_FILE_URL=https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis
 ACAPY_LABEL=BC Mediator (Dev)
 ACAPY_INVITE_LABEL=BC Wallet Service (Dev)
+LOG_LEVEL=INFO
+SESSION_AFFINITY=ClientIP
 MIN_REPLICAS=3
 MAX_REPLICAS=6
 CPU_REQUEST=10m

diff --git a/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.prod.param b/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.prod.param
@@ -29,8 +29,10 @@ AGENT_WS_URL=wss://aries-mediator-agent.vonx.io
 # GENESIS_FILE_URL=https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis
 ACAPY_LABEL=BC Mediator
 ACAPY_INVITE_LABEL=BC Wallet Service
-# MIN_REPLICAS=3
-# MAX_REPLICAS=6
+# LOG_LEVEL=INFO
+# SESSION_AFFINITY=ClientIP
+MIN_REPLICAS=1
+MAX_REPLICAS=1
 # CPU_REQUEST=10m
 # CPU_LIMIT=100m
 # MEMORY_REQUEST=96Mi

diff --git a/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.test.param b/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.test.param
@@ -29,8 +29,10 @@ AGENT_WS_URL=wss://aries-mediator-agent-test.apps.silver.devops.gov.bc.ca
 # GENESIS_FILE_URL=https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis
 ACAPY_LABEL=BC Mediator (Test)
 ACAPY_INVITE_LABEL=BC Wallet Service (Test)
-# MIN_REPLICAS=3
-# MAX_REPLICAS=6
+# LOG_LEVEL=INFO
+# SESSION_AFFINITY=ClientIP
+MIN_REPLICAS=1
+MAX_REPLICAS=1
 # CPU_REQUEST=10m
 # CPU_LIMIT=100m
 # MEMORY_REQUEST=96Mi

diff --git a/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.yaml b/openshift/templates/aries-mediator-agent/aries-mediator-agent-deploy.yaml
@@ -77,6 +77,7 @@ objects:
           targetPort: ${{INDY_AGENT_WS_PORT}}
       selector:
         name: ${NAME}${SUFFIX}
+      sessionAffinity: ${SESSION_AFFINITY}
 
   - kind: Secret
     apiVersion: v1
@@ -451,6 +452,12 @@ parameters:
     required: true
     value: INFO
 
+  - name: SESSION_AFFINITY
+    displayName: Session Affinity
+    description: Session Affinity; None or ClientIP
+    required: true
+    value: ClientIP
+
   - name: MIN_REPLICAS
     displayName: Minimum Replicas
     description: The minimum number of pods to have running.

diff --git a/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.dev.param b/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.dev.param
@@ -20,9 +20,12 @@
 # APP_NAME=aries-mediator-service
 # APP_GROUP=aries-mediator-service
 # IMAGE_NAMESPACE=4a9599-tools
+# ROUTE_TIMEOUT=60s
+# ROUTE_BALANCING=source
+# SESSION_AFFINITY=ClientIP
 # MIN_REPLICAS=3
-# MAX_REPLICAS=6
+# MAX_REPLICAS=9
 # CPU_REQUEST=10m
-# CPU_LIMIT=100m
-# MEMORY_REQUEST=24Mi
-# MEMORY_LIMIT=64Mi
+# CPU_LIMIT=300m
+# MEMORY_REQUEST=64Mi
+# MEMORY_LIMIT=128Mi
diff --git a/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.param b/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.param
@@ -20,9 +20,12 @@ SUFFIX=
 APP_NAME=aries-mediator-service
 APP_GROUP=aries-mediator-service
 IMAGE_NAMESPACE=4a9599-tools
+ROUTE_TIMEOUT=60s
+ROUTE_BALANCING=source
+SESSION_AFFINITY=ClientIP
 MIN_REPLICAS=3
-MAX_REPLICAS=6
+MAX_REPLICAS=9
 CPU_REQUEST=10m
-CPU_LIMIT=100m
-MEMORY_REQUEST=24Mi
-MEMORY_LIMIT=64Mi
+CPU_LIMIT=300m
+MEMORY_REQUEST=64Mi
+MEMORY_LIMIT=128Mi
diff --git a/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.prod.param b/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.prod.param
@@ -20,9 +20,12 @@ CERTBOT_MANAGED_ROUTE=true
 # APP_NAME=aries-mediator-service
 # APP_GROUP=aries-mediator-service
 # IMAGE_NAMESPACE=4a9599-tools
-# MIN_REPLICAS=3
-# MAX_REPLICAS=6
+# ROUTE_TIMEOUT=60s
+# ROUTE_BALANCING=source
+# SESSION_AFFINITY=ClientIP
+MIN_REPLICAS=1
+MAX_REPLICAS=1
 # CPU_REQUEST=10m
-# CPU_LIMIT=100m
-# MEMORY_REQUEST=24Mi
-# MEMORY_LIMIT=64Mi
+# CPU_LIMIT=300m
+# MEMORY_REQUEST=64Mi
+# MEMORY_LIMIT=128Mi
diff --git a/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.test.param b/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.test.param
@@ -20,9 +20,12 @@ APPLICATION_DOMAIN=aries-mediator-agent-test.apps.silver.devops.gov.bc.ca
 # APP_NAME=aries-mediator-service
 # APP_GROUP=aries-mediator-service
 # IMAGE_NAMESPACE=4a9599-tools
-# MIN_REPLICAS=3
-# MAX_REPLICAS=6
+# ROUTE_TIMEOUT=60s
+# ROUTE_BALANCING=source
+# SESSION_AFFINITY=ClientIP
+MIN_REPLICAS=1
+MAX_REPLICAS=1
 # CPU_REQUEST=10m
-# CPU_LIMIT=100m
-# MEMORY_REQUEST=24Mi
-# MEMORY_LIMIT=64Mi
+# CPU_LIMIT=300m
+# MEMORY_REQUEST=64Mi
+# MEMORY_LIMIT=128Mi
diff --git a/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.yaml b/openshift/templates/aries-mediator-proxy/aries-mediator-proxy-deploy.yaml
@@ -46,6 +46,7 @@ objects:
         certbot-managed: ${CERTBOT_MANAGED_ROUTE}
       annotations:
         haproxy.router.openshift.io/timeout: ${ROUTE_TIMEOUT}
+        haproxy.router.openshift.io/balance: ${ROUTE_BALANCING}
     spec:
       host: ${APPLICATION_ADMIN_DOMAIN}
       port:
@@ -71,6 +72,7 @@ objects:
         certbot-managed: ${CERTBOT_MANAGED_ROUTE}
       annotations:
         haproxy.router.openshift.io/timeout: ${ROUTE_TIMEOUT}
+        haproxy.router.openshift.io/balance: ${ROUTE_BALANCING}
     spec:
       host: ${APPLICATION_DOMAIN}
       port:
@@ -105,6 +107,7 @@ objects:
           targetPort: ${{CADDY_AGENT_ADMIN_PORT}}
       selector:
         name: ${NAME}${SUFFIX}
+      sessionAffinity: ${SESSION_AFFINITY}
 
   - kind: DeploymentConfig
     apiVersion: v1
@@ -340,6 +343,22 @@ parameters:
     description: The namespace of the OpenShift project containing the imagestream for the application.
     value: 4a9599-tools
 
+  - name: ROUTE_TIMEOUT
+    displayName: Route Timeout
+    description: Route timeout.
+    required: true
+    value: 60s
+  - name: ROUTE_BALANCING
+    displayName: Route Balancing
+    description: Route Balancing; random, source, roundrobin, or leastconn.
+    required: true
+    value: random
+  - name: SESSION_AFFINITY
+    displayName: Session Affinity
+    description: Session Affinity; None or ClientIP
+    required: true
+    value: None
+
   - name: MIN_REPLICAS
     displayName: Minimum Replicas
     description: The minimum number of pods to have running.
@@ -349,7 +368,7 @@ parameters:
     displayName: Maximum Replicas
     description: The maximum number of pods to have running.
     required: true
-    value: "6"
+    value: "9"
 
   - name: CPU_REQUEST
     displayName: Resources CPU Request
@@ -360,14 +379,14 @@ parameters:
     displayName: Resources CPU Limit
     description: The resources CPU limit (in cores) for this build.
     required: true
-    value: 100m
+    value: 300m
   - name: MEMORY_REQUEST
     displayName: Resources Memory Request
     description: The resources Memory request (in Mi, Gi, etc) for this build.
     required: true
-    value: 24Mi
+    value: 64Mi
   - name: MEMORY_LIMIT
     displayName: Resources Memory Limit
     description: The resources Memory limit (in Mi, Gi, etc) for this build.
     required: true
-    value: 64Mi
+    value: 128Mi