fix(installer): add request and limit resources for cilium workload (#…

…1602) Co-authored-by: yunjiazhong <[email protected]>
tkestack · Sep 28, 2021 · 6e8f177 · 6e8f177
1 parent 91e7629
commit 6e8f177
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/pkg/platform/provider/baremetal/manifests/cilium/cilium.yaml b/pkg/platform/provider/baremetal/manifests/cilium/cilium.yaml
@@ -496,6 +496,13 @@ spec:
                 - NET_ADMIN
                 - SYS_MODULE
             privileged: true
+          resources:
+            requests:
+              cpu: 100m
+              memory: 512Mi
+            limits:
+              cpu: 2000m
+              memory: 2Gi
           volumeMounts:
             - mountPath: /sys/fs/bpf
               name: bpf-maps
@@ -560,7 +567,10 @@ spec:
           resources:
             requests:
               cpu: 100m
-              memory: 100Mi
+              memory: 128Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
       restartPolicy: Always
       priorityClassName: system-node-critical
       serviceAccount: cilium
@@ -703,6 +713,13 @@ spec:
             initialDelaySeconds: 60
             periodSeconds: 10
             timeoutSeconds: 3
+          resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
+            limits:
+              cpu: 1000m
+              memory: 1Gi
           volumeMounts:
             - mountPath: /tmp/cilium/config-map
               name: cilium-config-path

diff --git a/pkg/platform/provider/baremetal/manifests/cilium/eni-ipamd.yaml b/pkg/platform/provider/baremetal/manifests/cilium/eni-ipamd.yaml
@@ -200,7 +200,10 @@ spec:
           resources:
             requests:
               cpu: 100m
-              memory: 100Mi
+              memory: 128Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           volumeMounts:

diff --git a/pkg/platform/provider/baremetal/manifests/cilium/masq-agent.yaml b/pkg/platform/provider/baremetal/manifests/cilium/masq-agent.yaml
@@ -26,7 +26,13 @@ spec:
         - image: {{ .MasqImage }}
           imagePullPolicy: IfNotPresent
           name: ip-masq-agent
-          resources: {}
+          resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
           securityContext:
             privileged: true
           terminationMessagePath: /dev/termination-log

diff --git a/pkg/platform/provider/baremetal/manifests/cilium/router.yaml b/pkg/platform/provider/baremetal/manifests/cilium/router.yaml
@@ -109,6 +109,9 @@ spec:
           imagePullPolicy: IfNotPresent
           name: cilium-router
           resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
             limits:
               cpu: 500m
               memory: 512Mi