From ca02f964b4526f9bac9b9ad81b22a4a72e3e64ce Mon Sep 17 00:00:00 2001
From: Satoshi Matsumoto <satoshi-matsumoto@cookpad.com>
Date: Wed, 20 May 2020 10:43:16 +0100
Subject: [PATCH] Update Amazon VPC CNI plugin to 1.6.1 (#110)

---
 modules/cluster/addons/aws-k8s-cni.yaml | 29 +++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/modules/cluster/addons/aws-k8s-cni.yaml b/modules/cluster/addons/aws-k8s-cni.yaml
index 720c14a2..11fcc71b 100644
--- a/modules/cluster/addons/aws-k8s-cni.yaml
+++ b/modules/cluster/addons/aws-k8s-cni.yaml
@@ -77,7 +77,20 @@ spec:
                     operator: In
                     values:
                       - amd64
-                  - key: eks.amazonaws.com/compute-type
+                  - key: "eks.amazonaws.com/compute-type"
+                    operator: NotIn
+                    values:
+                      - fargate
+              - matchExpressions:
+                  - key: "kubernetes.io/os"
+                    operator: In
+                    values:
+                      - linux
+                  - key: "kubernetes.io/arch"
+                    operator: In
+                    values:
+                      - amd64
+                  - key: "eks.amazonaws.com/compute-type"
                     operator: NotIn
                     values:
                       - fargate
@@ -86,15 +99,27 @@ spec:
       tolerations:
         - operator: Exists
       containers:
-        - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.7
+        - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.1
           imagePullPolicy: Always
           ports:
             - containerPort: 61678
               name: metrics
           name: aws-node
+          readinessProbe:
+            exec:
+              command: ["/app/grpc-health-probe", "-addr=:50051"]
+            initialDelaySeconds: 35
+          livenessProbe:
+            exec:
+              command: ["/app/grpc-health-probe", "-addr=:50051"]
+            initialDelaySeconds: 35
           env:
             - name: AWS_VPC_K8S_CNI_LOGLEVEL
               value: DEBUG
+            - name: AWS_VPC_K8S_CNI_VETHPREFIX
+              value: eni
+            - name: AWS_VPC_ENI_MTU
+              value: "9001"
             - name: MY_NODE_NAME
               valueFrom:
                 fieldRef: