Merge branch 'main' into staging

deploy.sh

@@ -109,7 +109,7 @@ function main() {
             minikube kubectl -- $@
         }
 
-        minikube start --driver kvm2 --cpus 4 --memory 4Gib
+        minikube start --driver kvm2 --cpus 2 --memory 4Gib
         minikube addons enable ingress-dns
         minikube addons enable ingress
 

template/backend/backend.template.yaml

@@ -13,8 +13,6 @@ spec:
             labels:
                 app: backend
         spec:
-            nodeSelector:
-                ${WORKER_NODE_LABEL}
             containers:
                 - name: backend
                   image: yoshiunfriendly/backend-hideyoshi.com
@@ -25,7 +23,7 @@ spec:
                           cpu: "250m"
                       limits:
                           memory: "256Mi"
-                          cpu: "500m"
+                          cpu: "250m"
                   ports:
                       - containerPort: 8070
                   readinessProbe:

template/frontend/frontend.template.yaml

@@ -15,19 +15,17 @@ spec:
             labels:
                 app: frontend
         spec:
-            nodeSelector: 
-                ${WORKER_NODE_LABEL}
             containers:
                 - name: frontend
                   image: yoshiunfriendly/frontend-hideyoshi.com:latest
                   imagePullPolicy: "Always"
                   resources:
                       requests:
-                          memory: "256Mi"
+                          memory: "128Mi"
-                          cpu: "250m"
+                          cpu: "75m"
                       limits:
-                          memory: "256Mi"
+                          memory: "128Mi"
-                          cpu: "250m"
+                          cpu: "75m"
                   ports:
                       - containerPort: 5000
                   env:

template/postgres/cn-cluster.template.yaml

@@ -19,9 +19,5 @@ spec:
             memory: "128Mi"
             cpu: "75m"
 
-    affinity:
-        nodeSelector:
-            ${MASTER_NODE_LABEL}
-
     monitoring:
         enablePodMonitor: true

template/storage/storage-processor.template.yaml

@@ -13,8 +13,6 @@ spec:
             labels:
                 app: storage-processor
         spec:
-            nodeSelector: 
-                ${WORKER_NODE_LABEL}
             containers:
                 - name: storage-processor
                   image: yoshiunfriendly/storage-hideyoshi.com:latest
@@ -22,11 +20,11 @@ spec:
                   imagePullPolicy: "Always"
                   resources:
                       requests:
-                          memory: "256Mi"
+                          memory: "128Mi"
-                          cpu: "250m"
+                          cpu: "75m"
                       limits:
-                          memory: "256Mi"
+                          memory: "128Mi"
-                          cpu: "250m"
+                          cpu: "75m"
                   env:
                       - name: ALLOWED_ORIGINS
                         valueFrom:

template/storage/storage.template.yaml

@@ -13,19 +13,17 @@ spec:
             labels:
                 app: storage
         spec:
-            nodeSelector:
-                ${WORKER_NODE_LABEL}
             containers:
                 - name: storage
                   image: yoshiunfriendly/storage-hideyoshi.com:latest
                   imagePullPolicy: "Always"
                   resources:
                       requests:
-                          memory: "256Mi"
+                          memory: "128Mi"
-                          cpu: "250m"
+                          cpu: "100m"
                       limits:
-                          memory: "256Mi"
+                          memory: "128Mi"
-                          cpu: "250m"
+                          cpu: "100m"
                   ports:
                       - containerPort: 8000
                   readinessProbe: