From 07ffaaefc399e42a4537a294dd461f297ceb49f9 Mon Sep 17 00:00:00 2001
From: mikesplain <mike.splain@gmail.com>
Date: Thu, 5 Mar 2020 16:51:03 -0500
Subject: [PATCH 1/2] Add env var config

---
 .../networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
index cd8e90084db6b..ffec7d79653d8 100644
--- a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
@@ -116,6 +116,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        {{- range .Networking.AmazonVPC.Env }}
+        - name: {{ .Name }}
+          value: "{{ .Value }}"
+        {{- end }}
         resources:
           requests:
             cpu: 10m

From 1d9bd4a14d52666b5e21b5bfae94023034c4f90d Mon Sep 17 00:00:00 2001
From: mikesplain <mike.splain@gmail.com>
Date: Thu, 5 Mar 2020 17:11:25 -0500
Subject: [PATCH 2/2] Fix Tests

---
 .../tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml     | 2 +-
 .../amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
index e2b1b891ea825..1733bb01ae538 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
@@ -113,7 +113,7 @@ spec:
   - id: k8s-1.16
     kubernetesVersion: '>=1.16.0'
     manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
-    manifestHash: ff9687c4431781c50257b44a9610765e52d0f137
+    manifestHash: b946da9da7a2bd171e807ed39ed07e6f1eb868ee
     name: networking.amazon-vpc-routed-eni
     selector:
       role.kubernetes.io/networking: "1"
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
index 1f23a6218f456..0d521860f7049 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
@@ -100,6 +100,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: WARM_IP_TARGET
+          value: "10"
+        - name: AWS_VPC_K8S_CNI_LOGLEVEL
+          value: debug
         image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.0
         imagePullPolicy: Always
         livenessProbe: