Merge pull request openshift#1298 from rgolangh/master

ovirt: reduce static pods mem/cpu requirements
n1r1 · Dec 20, 2019 · 347a7a0 · 347a7a0
2 parents 66ad271 + 37bba8f
commit 347a7a0
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/manifests/ovirt/coredns.yaml b/manifests/ovirt/coredns.yaml
@@ -60,8 +60,8 @@ spec:
     - "/etc/coredns/Corefile"
     resources:
       requests:
-        cpu: 150m
-        memory: 1Gi
+        cpu: 100m
+        memory: 200Mi
     volumeMounts:
     - name: conf-dir
       mountPath: "/etc/coredns"

diff --git a/manifests/ovirt/keepalived.yaml b/manifests/ovirt/keepalived.yaml
@@ -69,8 +69,8 @@ spec:
     - "--log-console"
     resources:
       requests:
-        cpu: 150m
-        memory: 1Gi
+        cpu: 100m
+        memory: 200Mi
     volumeMounts:
     - name: conf-dir
       mountPath: "/etc/keepalived"

diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
@@ -2125,8 +2125,8 @@ spec:
     - "/etc/coredns/Corefile"
     resources:
       requests:
-        cpu: 150m
-        memory: 1Gi
+        cpu: 100m
+        memory: 200Mi
     volumeMounts:
     - name: conf-dir
       mountPath: "/etc/coredns"
@@ -2295,8 +2295,8 @@ spec:
     - "--log-console"
     resources:
       requests:
-        cpu: 150m
-        memory: 1Gi
+        cpu: 100m
+        memory: 200Mi
     volumeMounts:
     - name: conf-dir
       mountPath: "/etc/keepalived"

diff --git a/templates/common/ovirt/files/ovirt-coredns.yaml b/templates/common/ovirt/files/ovirt-coredns.yaml
@@ -58,8 +58,8 @@ contents:
         - "/etc/coredns/Corefile"
         resources:
           requests:
-            cpu: 150m
-            memory: 1Gi
+            cpu: 100m
+            memory: 200Mi
         volumeMounts:
         - name: conf-dir
           mountPath: "/etc/coredns"

diff --git a/templates/common/ovirt/files/ovirt-keepalived.yaml b/templates/common/ovirt/files/ovirt-keepalived.yaml
@@ -70,8 +70,8 @@ contents:
           socat UNIX-LISTEN:${keepalived_sock},fork system:'bash -c msg_handler'
         resources:
           requests:
-            cpu: 150m
-            memory: 1Gi
+            cpu: 100m
+            memory: 200Mi
         volumeMounts:
         - name: conf-dir
           mountPath: "/etc/keepalived"

diff --git a/templates/common/ovirt/files/ovirt-mdns-publisher.yaml b/templates/common/ovirt/files/ovirt-mdns-publisher.yaml
@@ -55,8 +55,8 @@ contents:
         - "--debug"
         resources:
           requests:
-            cpu: 150m
-            memory: 1Gi
+            cpu: 100m
+            memory: 200Mi
         volumeMounts:
         - name: conf-dir
           mountPath: "/etc/mdns"

diff --git a/templates/master/00-master/ovirt/files/ovirt-haproxy.yaml b/templates/master/00-master/ovirt/files/ovirt-haproxy.yaml
@@ -67,6 +67,10 @@ contents:
               /usr/sbin/haproxy -W -db -f /etc/haproxy/haproxy.cfg  -p /var/lib/haproxy/run/haproxy.pid &
           fi
           socat UNIX-LISTEN:${haproxy_sock},fork system:'bash -c msg_handler'
+        resources:
+          requests:
+            cpu: 100m
+            memory: 200Mi
         volumeMounts:
         - name: conf-dir
           mountPath: "/etc/haproxy"
@@ -90,6 +94,10 @@ contents:
         - "/etc/haproxy/haproxy.cfg"
         - "--api-vip"
         - "{{ .Infra.Status.PlatformStatus.Ovirt.APIServerInternalIP }}"
+        resources:
+          requests:
+            cpu: 100m
+            memory: 200Mi
         volumeMounts:
         - name: conf-dir
           mountPath: "/etc/haproxy"