Skip to content

ovirt: reduce static pods mem/cpu requirements #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 20, 2019
Merged

ovirt: reduce static pods mem/cpu requirements #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/ovirt/coredns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions manifests/ovirt/keepalived.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ spec:
- "--log-console"
resources:
requests:
cpu: 150m
memory: 1Gi
cpu: 100m
memory: 200Mi
volumeMounts:
- name: conf-dir
mountPath: "/etc/keepalived"
Expand Down
8 changes: 4 additions & 4 deletions pkg/operator/assets/bindata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -2295,8 +2295,8 @@ spec:
- "--log-console"
resources:
requests:
cpu: 150m
memory: 1Gi
cpu: 100m
memory: 200Mi
volumeMounts:
- name: conf-dir
mountPath: "/etc/keepalived"
Expand Down
4 changes: 2 additions & 2 deletions templates/common/ovirt/files/ovirt-coredns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions templates/common/ovirt/files/ovirt-keepalived.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions templates/common/ovirt/files/ovirt-mdns-publisher.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ contents:
- "--debug"
resources:
requests:
cpu: 150m
memory: 1Gi
cpu: 100m
memory: 200Mi
volumeMounts:
- name: conf-dir
mountPath: "/etc/mdns"
Expand Down
8 changes: 8 additions & 0 deletions templates/master/00-master/ovirt/files/ovirt-haproxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down