diff --git a/charts/aws-vpc-cni/Chart.yaml b/charts/aws-vpc-cni/Chart.yaml index e018f868de..eec750c857 100644 --- a/charts/aws-vpc-cni/Chart.yaml +++ b/charts/aws-vpc-cni/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: aws-vpc-cni -version: 1.1.17 +version: 1.1.18 appVersion: "v1.11.2" description: A Helm chart for the AWS VPC CNI icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png diff --git a/charts/aws-vpc-cni/values.yaml b/charts/aws-vpc-cni/values.yaml index 91f571607e..03a89513fc 100644 --- a/charts/aws-vpc-cni/values.yaml +++ b/charts/aws-vpc-cni/values.yaml @@ -116,7 +116,7 @@ readinessProbeTimeoutSeconds: 10 resources: requests: - cpu: 10m + cpu: 25m updateStrategy: type: RollingUpdate diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml index a3b3972339..ae61d5dd45 100644 --- a/config/master/aws-k8s-cni-cn.yaml +++ b/config/master/aws-k8s-cni-cn.yaml @@ -214,7 +214,7 @@ spec: fieldPath: spec.nodeName resources: requests: - cpu: 10m + cpu: 25m securityContext: capabilities: add: 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 0c878c4194..86bce4376a 100644 --- a/config/master/aws-k8s-cni-us-gov-east-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-east-1.yaml @@ -214,7 +214,7 @@ spec: fieldPath: spec.nodeName resources: requests: - cpu: 10m + cpu: 25m securityContext: capabilities: add: 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 040420d900..3a5c8a8085 100644 --- a/config/master/aws-k8s-cni-us-gov-west-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-west-1.yaml @@ -214,7 +214,7 @@ spec: fieldPath: spec.nodeName resources: requests: - cpu: 10m + cpu: 25m securityContext: capabilities: add: diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml index 1c7cdf7448..72a7064fc3 100644 --- a/config/master/aws-k8s-cni.yaml +++ b/config/master/aws-k8s-cni.yaml @@ -214,7 +214,7 @@ spec: fieldPath: spec.nodeName resources: requests: - cpu: 10m + cpu: 25m securityContext: capabilities: add: diff --git a/config/master/manifests.jsonnet b/config/master/manifests.jsonnet index d531f599f3..8690442d24 100644 --- a/config/master/manifests.jsonnet +++ b/config/master/manifests.jsonnet @@ -155,10 +155,10 @@ local awsnode = { name: "aws-node", readinessProbe: { exec: { - command: ["/app/grpc-health-probe", "-addr=:50051", "-connect-timeout=2s", "-rpc-timeout=2s"], + command: ["/app/grpc-health-probe", "-addr=:50051", "-connect-timeout=5s", "-rpc-timeout=5s"], }, initialDelaySeconds: 1, - timeoutSeconds: 5, + timeoutSeconds: 10, }, livenessProbe: self.readinessProbe + { initialDelaySeconds: 60, @@ -196,7 +196,7 @@ local awsnode = { for kv in objectItems(self.env_) ], resources: { - requests: {cpu: "10m"}, + requests: {cpu: "25m"}, }, securityContext: { capabilities: {add: ["NET_ADMIN"]},