use minimal resource requests

Save some resources on our limited OKD clusters. Signed-off-by: Petr Horacek <[email protected]>
RamLavi · Nov 12, 2019 · 5847580 · 5847580
1 parent e9145a0
commit 5847580
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 13 deletions.
diff --git a/cluster/up.sh b/cluster/up.sh
@@ -21,6 +21,13 @@ kubevirtci::install
 
 $(kubevirtci::path)/cluster-up/up.sh
 
+if [[ "$KUBEVIRT_PROVIDER" =~ okd- ]]; then
+    echo 'Remove components we do not need to save some resources'
+    ./cluster/kubectl.sh delete ns openshift-monitoring --wait=false
+    ./cluster/kubectl.sh delete ns openshift-marketplace --wait=false
+    ./cluster/kubectl.sh delete ns openshift-cluster-samples-operator --wait=false
+fi
+
 if [[ "$KUBEVIRT_PROVIDER" =~ k8s- ]]; then
     echo 'Install NetworkManager on nodes'
     for node in $(./cluster/kubectl.sh get nodes --no-headers | awk '{print $1}'); do

diff --git a/data/kubemacpool/003-deployment.yaml b/data/kubemacpool/003-deployment.yaml
@@ -68,7 +68,7 @@ spec:
         resources:
           limits:
             cpu: 300m
-            memory: 600Mi
+            memory: 300Mi
           requests:
             cpu: 100m
             memory: 300Mi

diff --git a/data/linux-bridge/0004-bridge-marker-daemonset.yaml b/data/linux-bridge/0004-bridge-marker-daemonset.yaml
@@ -29,6 +29,13 @@ spec:
       - name: bridge-marker
         image: {{ .LinuxBridgeMarkerImage }}
         imagePullPolicy: {{ .ImagePullPolicy }}
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "40Mi"
+          limits:
+            cpu: "100m"
+            memory: "40Mi"
         args:
           - -node-name
           - $(NODE_NAME)

diff --git a/data/linux-bridge/002-linux-bridge.yaml b/data/linux-bridge/002-linux-bridge.yaml
@@ -46,11 +46,11 @@ spec:
               sleep infinity
           resources:
             requests:
-              cpu: "100m"
-              memory: "50Mi"
+              cpu: "60m"
+              memory: "30Mi"
             limits:
-              cpu: "100m"
-              memory: "50Mi"
+              cpu: "60m"
+              memory: "30Mi"
           securityContext:
             privileged: true
           volumeMounts:

diff --git a/data/multus/002-multus.yaml b/data/multus/002-multus.yaml
@@ -54,11 +54,11 @@ spec:
         imagePullPolicy: {{ .ImagePullPolicy }}
         resources:
           requests:
-            cpu: "100m"
-            memory: "50Mi"
+            cpu: "60m"
+            memory: "30Mi"
           limits:
-            cpu: "100m"
-            memory: "50Mi"
+            cpu: "60m"
+            memory: "30Mi"
         securityContext:
           privileged: true
         volumeMounts:

diff --git a/data/nmstate/003-operator.yaml b/data/nmstate/003-operator.yaml
@@ -31,6 +31,13 @@ spec:
           - --v=production
           image:  {{ .NMStateHandlerImage }}
           imagePullPolicy: {{ .ImagePullPolicy }}
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "60Mi"
+            limits:
+              cpu: "100m"
+              memory: "60Mi"
           command:
           - kubernetes-nmstate
           env:

diff --git a/data/ovs/002-ovs-daemonset.yaml b/data/ovs/002-ovs-daemonset.yaml
@@ -31,11 +31,11 @@ spec:
           imagePullPolicy: {{ .ImagePullPolicy }}
           resources:
             requests:
-              cpu: "100m"
-              memory: "50Mi"
+              cpu: "60m"
+              memory: "30Mi"
             limits:
-              cpu: "100m"
-              memory: "50Mi"
+              cpu: "60m"
+              memory: "30Mi"
           securityContext:
             privileged: true
           volumeMounts:
@@ -44,6 +44,13 @@ spec:
         - name: ovs-cni-marker
           image: {{ .OvsMarkerImage }}
           imagePullPolicy: {{ .ImagePullPolicy }}
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "40Mi"
+            limits:
+              cpu: "100m"
+              memory: "40Mi"
           securityContext:
             privileged: true
           args: