From d12bf8342bf85e19e17874917591e0be31ceb84a Mon Sep 17 00:00:00 2001 From: Claes Mogren Date: Tue, 1 Sep 2020 17:05:17 -0700 Subject: [PATCH] Add iptables fix and update to v1.7.1 --- config/v1.7/aws-k8s-cni-cn.yaml | 9 +++++++-- config/v1.7/aws-k8s-cni-us-gov-east-1.yaml | 9 +++++++-- config/v1.7/aws-k8s-cni-us-gov-west-1.yaml | 9 +++++++-- config/v1.7/aws-k8s-cni.yaml | 9 +++++++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/config/v1.7/aws-k8s-cni-cn.yaml b/config/v1.7/aws-k8s-cni-cn.yaml index ea9816814d..740c598fbb 100644 --- a/config/v1.7/aws-k8s-cni-cn.yaml +++ b/config/v1.7/aws-k8s-cni-cn.yaml @@ -153,7 +153,7 @@ "fieldPath": "spec.nodeName" - "name": "WARM_ENI_TARGET" "value": "1" - "image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.7.0" + "image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.7.1" "imagePullPolicy": "Always" "livenessProbe": "exec": @@ -189,9 +189,11 @@ "name": "run-dir" - "mountPath": "/var/run/dockershim.sock" "name": "dockershim" + - "mountPath": "/run/xtables.lock" + "name": "xtables-lock" "hostNetwork": true "initContainers": - - "image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.7.0" + - "image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.7.1" "imagePullPolicy": "Always" "name": "aws-vpc-cni-init" "securityContext": @@ -214,6 +216,9 @@ - "hostPath": "path": "/var/run/dockershim.sock" "name": "dockershim" + - "hostPath": + "path": "/run/xtables.lock" + "name": "xtables-lock" - "hostPath": "path": "/var/log/aws-routed-eni" "type": "DirectoryOrCreate" diff --git a/config/v1.7/aws-k8s-cni-us-gov-east-1.yaml b/config/v1.7/aws-k8s-cni-us-gov-east-1.yaml index 73411239a5..dc2220c577 100644 --- a/config/v1.7/aws-k8s-cni-us-gov-east-1.yaml +++ b/config/v1.7/aws-k8s-cni-us-gov-east-1.yaml @@ -153,7 +153,7 @@ "fieldPath": "spec.nodeName" - "name": "WARM_ENI_TARGET" "value": "1" - "image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.7.0" + "image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.7.1" "imagePullPolicy": "Always" "livenessProbe": "exec": @@ -189,9 +189,11 @@ "name": "run-dir" - "mountPath": "/var/run/dockershim.sock" "name": "dockershim" + - "mountPath": "/run/xtables.lock" + "name": "xtables-lock" "hostNetwork": true "initContainers": - - "image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.7.0" + - "image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.7.1" "imagePullPolicy": "Always" "name": "aws-vpc-cni-init" "securityContext": @@ -214,6 +216,9 @@ - "hostPath": "path": "/var/run/dockershim.sock" "name": "dockershim" + - "hostPath": + "path": "/run/xtables.lock" + "name": "xtables-lock" - "hostPath": "path": "/var/log/aws-routed-eni" "type": "DirectoryOrCreate" diff --git a/config/v1.7/aws-k8s-cni-us-gov-west-1.yaml b/config/v1.7/aws-k8s-cni-us-gov-west-1.yaml index 3209dd476b..4adda0df50 100644 --- a/config/v1.7/aws-k8s-cni-us-gov-west-1.yaml +++ b/config/v1.7/aws-k8s-cni-us-gov-west-1.yaml @@ -153,7 +153,7 @@ "fieldPath": "spec.nodeName" - "name": "WARM_ENI_TARGET" "value": "1" - "image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.7.0" + "image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.7.1" "imagePullPolicy": "Always" "livenessProbe": "exec": @@ -189,9 +189,11 @@ "name": "run-dir" - "mountPath": "/var/run/dockershim.sock" "name": "dockershim" + - "mountPath": "/run/xtables.lock" + "name": "xtables-lock" "hostNetwork": true "initContainers": - - "image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.7.0" + - "image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.7.1" "imagePullPolicy": "Always" "name": "aws-vpc-cni-init" "securityContext": @@ -214,6 +216,9 @@ - "hostPath": "path": "/var/run/dockershim.sock" "name": "dockershim" + - "hostPath": + "path": "/run/xtables.lock" + "name": "xtables-lock" - "hostPath": "path": "/var/log/aws-routed-eni" "type": "DirectoryOrCreate" diff --git a/config/v1.7/aws-k8s-cni.yaml b/config/v1.7/aws-k8s-cni.yaml index 76ec7336b4..4e95a78eb5 100644 --- a/config/v1.7/aws-k8s-cni.yaml +++ b/config/v1.7/aws-k8s-cni.yaml @@ -153,7 +153,7 @@ "fieldPath": "spec.nodeName" - "name": "WARM_ENI_TARGET" "value": "1" - "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.0" + "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.1" "imagePullPolicy": "Always" "livenessProbe": "exec": @@ -189,9 +189,11 @@ "name": "run-dir" - "mountPath": "/var/run/dockershim.sock" "name": "dockershim" + - "mountPath": "/run/xtables.lock" + "name": "xtables-lock" "hostNetwork": true "initContainers": - - "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.0" + - "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.1" "imagePullPolicy": "Always" "name": "aws-vpc-cni-init" "securityContext": @@ -214,6 +216,9 @@ - "hostPath": "path": "/var/run/dockershim.sock" "name": "dockershim" + - "hostPath": + "path": "/run/xtables.lock" + "name": "xtables-lock" - "hostPath": "path": "/var/log/aws-routed-eni" "type": "DirectoryOrCreate"