diff --git a/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh b/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh index f0ead55cc1..441fbe52f1 100755 --- a/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh +++ b/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh @@ -104,12 +104,9 @@ data: replicaCount: 1 minAvailable: 1 resources: - limits: - cpu: 100m - memory: 64Mi requests: - cpu: 100m - memory: 64Mi + cpu: 200m + memory: 256Mi autoscaling: enabled: false customTemplate: @@ -163,7 +160,7 @@ data: release: prometheus-operator namespace: kube-system lifecycle: {} - priorityClassName: "" + priorityClassName: "system-node-critical" revisionHistoryLimit: 10 defaultBackend: enabled: true @@ -182,9 +179,6 @@ data: replicaCount: 1 minAvailable: 1 resources: - limits: - cpu: 10m - memory: 20Mi requests: cpu: 10m memory: 20Mi @@ -196,7 +190,7 @@ data: loadBalancerSourceRanges: [] servicePort: 80 type: ClusterIP - priorityClassName: "" + priorityClassName: "system-cluster-critical" rbac: create: true podSecurityPolicy: diff --git a/releasenotes/notes/fix-nginx-getting-oom-killed-76139fd8b57e6c15.yaml b/releasenotes/notes/fix-nginx-getting-oom-killed-76139fd8b57e6c15.yaml new file mode 100644 index 0000000000..cf5aeee375 --- /dev/null +++ b/releasenotes/notes/fix-nginx-getting-oom-killed-76139fd8b57e6c15.yaml @@ -0,0 +1,11 @@ +--- +upgrade: + - | + nginx-ingress-controller QoS changed from Guaranteed to Burstable. + Priority class 'system-cluster-critical' or higher for + nginx-ingress-controller. +fixes: + - | + nginx-ingress-controller requests.memory increased to 256MiB. This is a + result of tests that showed the pod getting oom killed by the node on + a relatively generic use case.