complete update app from fib calculator to smartbrain

mosabami · Apr 19, 2023 · 42812cf · 42812cf
1 parent 5f999a8
commit 42812cf
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 50 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceFolder}\\smartbrain\\smartbrain\\smartbrainapi\\server.js",
+            "program": "${file}",
             "preLaunchTask": "bridge-to-kubernetes.resource",
             "env": {
                 "GRPC_DNS_RESOLVER": "native"
@@ -24,7 +24,7 @@
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceFolder}\\smartbrain\\smartbrain\\smartbrainapi\\server.js"
+            "program": "${file}"
         }
     ]
 }
diff --git a/IaC/main.bicep b/IaC/main.bicep
@@ -13,7 +13,7 @@ module aksconst 'aks-construction/bicep/main.bicep' = {
     registries_sku: 'Standard'
     omsagent: true
     retentionInDays: 30
-    agentCount: 1
+    agentCount: 2
     agentVMSize: 'Standard_D2ds_v4'
     osDiskType: 'Managed'
     AksPaidSkuForSLA: true

diff --git a/README.md b/README.md
diff --git a/k8s/api-deployment.yaml b/k8s/api-deployment.yaml
@@ -28,7 +28,7 @@ spec:
           command: ['sh', '-c', "until nslookup postgres-service.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for postgres-service; sleep 2; done"]
       containers:
         - name: server
-          image: <ACR name>.azurecr.io/server:v20
+          image: <ACR name>.azurecr.io/server:v1
           imagePullPolicy: Always
           resources:
             requests:

diff --git a/k8s/client-deployment.yaml b/k8s/client-deployment.yaml
@@ -17,11 +17,11 @@ spec:
         - name: client
           resources:
             requests:
-              cpu: 250m
-              memory: 128Mi
+              cpu: 500m
+              memory: 256Mi
             limits:
               cpu: 1000m
-              memory: 256Mi
+              memory: 512Mi
           imagePullPolicy: Always
           image: <ACR name>.azurecr.io/client:v1
           ports: 

diff --git a/k8s/ingress-service.yaml b/k8s/ingress-service.yaml
@@ -7,7 +7,7 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: 'nginx'
     nginx.ingress.kubernetes.io/use-regex: 'true'
-    nginx.ingress.kubernetes.io/rewrite-target: /$1
+    # nginx.ingress.kubernetes.io/rewrite-target: /$1
 spec:
   rules:
     - http:

diff --git a/k8s/worker-deployment.yaml b/k8s/worker-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: worker-deployment
   namespace: superapp
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       component: worker
@@ -19,11 +19,11 @@ spec:
         - name: worker
           resources:
             requests:
-              cpu: 250m
+              cpu: 50m
               memory: 128Mi
             limits:
-              cpu: 1000m
-              memory: 256Mi
+              cpu: 200m
+              memory: 512Mi
           image: <ACR name>.azurecr.io/worker:v1
           ports:
             - containerPort: 2000

diff --git a/loadtesting/test-superapp.jmx b/loadtesting/test-superapp.jmx
@@ -159,17 +159,17 @@
           <collectionProp name="Arguments.arguments">
             <elementProp name="endpoint" elementType="Argument">
               <stringProp name="Argument.name">endpoint</stringProp>
-              <stringProp name="Argument.value">20.242.223.32</stringProp>
+              <stringProp name="Argument.value">20.237.103.190</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
             </elementProp>
             <elementProp name="threads" elementType="Argument">
               <stringProp name="Argument.name">threads</stringProp>
-              <stringProp name="Argument.value">250</stringProp>
+              <stringProp name="Argument.value">50</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
             </elementProp>
             <elementProp name="loops" elementType="Argument">
               <stringProp name="Argument.name">loops</stringProp>
-              <stringProp name="Argument.value">200</stringProp>
+              <stringProp name="Argument.value">250</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
             </elementProp>
           </collectionProp>

diff --git a/loadtesting/worker-hpa.yaml b/loadtesting/worker-hpa.yaml
@@ -10,4 +10,4 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: worker-deployment
-  targetCPUUtilizationPercentage: 50
+  targetCPUUtilizationPercentage: 30
diff --git a/media/bug-fixed.png b/media/bug-fixed.png
diff --git a/media/cpu-usage-10-50.png b/media/cpu-usage-10-50.png
diff --git a/media/host-address-postgres-service.png b/media/host-address-postgres-service.png
diff --git a/media/incorrect-count.png b/media/incorrect-count.png
diff --git a/media/new-node-added.png b/media/new-node-added.png
diff --git a/media/new-pods-scheduled.png b/media/new-pods-scheduled.png
diff --git a/media/node-not-fully-utilized.png b/media/node-not-fully-utilized.png
diff --git a/media/nodes-pods-scheduled-to.png b/media/nodes-pods-scheduled-to.png
diff --git a/media/pods-in-pending.png b/media/pods-in-pending.png
diff --git a/media/running-local.png b/media/running-local.png
diff --git a/media/scheduled-pods-full-utilized.png b/media/scheduled-pods-full-utilized.png
diff --git a/media/used-host-address.png b/media/used-host-address.png
diff --git a/smartbrain b/smartbrain
+1 −0		smartbrain/docker-compose.yaml
+2 −2		smartbrain/smartbrainapi/server.js
+1 −1		smartbrain/smartbrainclient/src/components/Signin/Signin.js