Merge pull request #855 from Dieken/master

make sure flanneld got QoS class "Guaranteed" to have lower oom_score_adj

Documentation/k8s-manifests/kube-flannel-legacy.yml

@@ -58,6 +58,13 @@ spec:
         args:
         - --ip-masq
         - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
         securityContext:
           privileged: true
         env:

Documentation/kube-flannel-aliyun.yml

@@ -114,6 +114,13 @@ spec:
         args:
         - --ip-masq
         - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
         securityContext:
           privileged: true
         env:

Documentation/kube-flannel.yml

@@ -124,6 +124,13 @@ spec:
         args:
         - --ip-masq
         - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
         securityContext:
           privileged: true
         env:

Documentation/minikube.yml

@@ -59,6 +59,13 @@ spec:
         args:
         - --ip-masq
         - --kube-subnet-mgr
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
         securityContext:
           privileged: true
         env: