From 1c1044bd6967f3cd1fa2e5af1c64e6864b4cc85d Mon Sep 17 00:00:00 2001 From: MoShitrit Date: Fri, 19 Jun 2020 16:23:18 -0400 Subject: [PATCH] Upgrade Amazon VPC CNI to 1.6.3 --- upup/models/bindata.go | 2 +- .../networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template | 2 +- .../tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml | 2 +- .../amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/upup/models/bindata.go b/upup/models/bindata.go index 24ade652aa4fa..25659102864d7 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -3948,7 +3948,7 @@ spec: tolerations: - operator: Exists containers: - - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.2" }}" + - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.3" }}" imagePullPolicy: Always ports: - containerPort: 61678 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 9f2661ae26a87..8bf31687762a6 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 @@ -88,7 +88,7 @@ spec: tolerations: - operator: Exists containers: - - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.2" }}" + - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.3" }}" imagePullPolicy: Always ports: - containerPort: 61678 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 403ee9a0d0ccf..b6b0f6f7cc8f2 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -105,7 +105,7 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0' manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 92f1b119fe4732fe00ea4bf2e8846a2579e39dc9 + manifestHash: 61ba5dc7aec5164020d9f8e1336e11819fe18af2 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 05e784dcb8f32..30d9d3c332ce2 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 @@ -103,7 +103,7 @@ spec: value: "10" - name: AWS_VPC_K8S_CNI_LOGLEVEL value: debug - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.3 imagePullPolicy: Always livenessProbe: exec: