Merge branch 'v2.3' into release/v2.3.9

kontena · Jun 7, 2019 · 5be403e · 5be403e
2 parents 624e6f6 + 87f7b82
commit 5be403e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/addons/ingress-nginx/resources/daemonset.yml.erb b/addons/ingress-nginx/resources/daemonset.yml.erb
@@ -95,3 +95,7 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
+          resources:
+            requests:
+              cpu: 100m
+              memory: 90Mi