Merge pull request #18 from mindwm/fix_cpu_limit

Reduce cpu request for istiod and redpanda cluster
mindwm · May 29, 2024 · 635cb69 · 635cb69
2 parents 6a2309f + b9ee59a
commit 635cb69
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -9,8 +9,10 @@ HELM_RUN := docker run --rm -v ~/.kube:/root/.kube -e KUBECONFIG=/root/.kube/con
 #helm upgrade --install --namespace argocd --create-namespace argocd argocd/argo-cd --set global.image.tag=v2.9.12 --set repoServer.extraArguments[0]="--repo-cache-expiration=1m",repoServer.extraArguments[1]="--default-cache-expiration=1m",repoServer.extraArguments[2]="--repo-server-timeout-seconds=240s"  --wait --timeout 5m && \
 
 fix_dns_upstream:
-	kubectl -n kube-system get configmap coredns -o yaml | sed 's,forward . /etc/resolv.conf,forward \. 8.8.8.8,' | kubectl apply -f - && \
-	kubectl delete pod -n kube-system -l k8s-app=kube-dns
+	$(KUBECTL_RUN) '\
+		kubectl -n kube-system get configmap coredns -o yaml | sed "s,forward . /etc/resolv.conf,forward \. 8.8.8.8," | kubectl apply -f - && \
+		kubectl delete pod -n kube-system -l k8s-app=kube-dns \
+	'
 
 crossplane_rolebinding_workaround:
 	$(KUBECTL_RUN) '\
@@ -96,7 +98,7 @@ argocd_exec: argocd_password
 
 .PHONY: argocd_app
 argocd_app: argocd
-	kubectl apply -f argocd_mindwm_app.yaml
+	$(KUBECTL_RUN) 'kubectl apply -f argocd_mindwm_app.yaml'
 
 argocd_sync: argocd_app argocd_login
 	argocd app sync mindwm-gitops

diff --git a/config.k b/config.k
@@ -104,6 +104,9 @@ istio = {
     gateway = {
         namespace = "istio-system"
     } 
+    pilot = {
+        cpu_req = 100m
+    } 
 }
 
 kafka_cluster_name = "neo4j-cdc"

diff --git a/main.k b/main.k
@@ -166,6 +166,10 @@ mindwm_app = ArgoCdOrder.make({
                 name = "istiod"
                 chart = charts.istiod
                 version = config.istio.version
+                values = {
+                    defaults.pilot.resources.requests = config.istio.pilot.cpu_req    
+                }
+
             })
         ]
         [