From d03b0dc776ddfd0ba4297fee630a252e99e458a3 Mon Sep 17 00:00:00 2001
From: Michael Grosser <michael@grosser.it>
Date: Mon, 2 Aug 2021 12:04:58 -0700
Subject: [PATCH] set requests/limits for initcontainer (#1559)

---
 config/master/aws-k8s-cni-cn.yaml            | 7 +++++++
 config/master/aws-k8s-cni-us-gov-east-1.yaml | 7 +++++++
 config/master/aws-k8s-cni-us-gov-west-1.yaml | 7 +++++++
 config/master/aws-k8s-cni.yaml               | 7 +++++++
 config/master/manifests.jsonnet              | 4 ++++
 5 files changed, 32 insertions(+)

diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml
index ce6c7033ec..5bee80a66f 100644
--- a/config/master/aws-k8s-cni-cn.yaml
+++ b/config/master/aws-k8s-cni-cn.yaml
@@ -202,6 +202,13 @@
           "value": "false"
         "image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.9.0"
         "name": "aws-vpc-cni-init"
+        "resources":
+          "limits":
+            "cpu": "50m"
+            "memory": "64Mi"
+          "requests":
+            "cpu": "10m"
+            "memory": "32Mi"
         "securityContext":
           "privileged": true
         "volumeMounts":
diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml
index f7129158f7..73f47f32db 100644
--- a/config/master/aws-k8s-cni-us-gov-east-1.yaml
+++ b/config/master/aws-k8s-cni-us-gov-east-1.yaml
@@ -202,6 +202,13 @@
           "value": "false"
         "image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.9.0"
         "name": "aws-vpc-cni-init"
+        "resources":
+          "limits":
+            "cpu": "50m"
+            "memory": "64Mi"
+          "requests":
+            "cpu": "10m"
+            "memory": "32Mi"
         "securityContext":
           "privileged": true
         "volumeMounts":
diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml
index e105763f50..9753a64ba7 100644
--- a/config/master/aws-k8s-cni-us-gov-west-1.yaml
+++ b/config/master/aws-k8s-cni-us-gov-west-1.yaml
@@ -202,6 +202,13 @@
           "value": "false"
         "image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.9.0"
         "name": "aws-vpc-cni-init"
+        "resources":
+          "limits":
+            "cpu": "50m"
+            "memory": "64Mi"
+          "requests":
+            "cpu": "10m"
+            "memory": "32Mi"
         "securityContext":
           "privileged": true
         "volumeMounts":
diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml
index 2c8a24828c..2993bfa727 100644
--- a/config/master/aws-k8s-cni.yaml
+++ b/config/master/aws-k8s-cni.yaml
@@ -202,6 +202,13 @@
           "value": "false"
         "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.0"
         "name": "aws-vpc-cni-init"
+        "resources":
+          "limits":
+            "cpu": "50m"
+            "memory": "64Mi"
+          "requests":
+            "cpu": "10m"
+            "memory": "32Mi"
         "securityContext":
           "privileged": true
         "volumeMounts":
diff --git a/config/master/manifests.jsonnet b/config/master/manifests.jsonnet
index 5ec8bf1a07..c2390ca645 100644
--- a/config/master/manifests.jsonnet
+++ b/config/master/manifests.jsonnet
@@ -233,6 +233,10 @@ local awsnode = {
                   name: "DISABLE_TCP_EARLY_DEMUX", value: "false",
                 },
               ],
+              resources: {
+                requests: {cpu: "10m", memory: "32Mi"},
+                limits: {cpu: "50m", memory: "64Mi"},
+              },
               volumeMounts: [
                 {mountPath: "/host/opt/cni/bin", name: "cni-bin-dir"},
               ],