From f2bb2e587c392cffb7b0e40b9e61ee2c4d917ca2 Mon Sep 17 00:00:00 2001 From: MoShitrit Date: Sat, 12 Dec 2020 01:03:02 -0500 Subject: [PATCH] Bump aws-cni to 1.7.7 --- upup/models/bindata.go | 4 ++-- .../networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template | 4 ++-- .../tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml | 2 +- .../amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/upup/models/bindata.go b/upup/models/bindata.go index 280c97eedf..2ce48eeb7e 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -29744,7 +29744,7 @@ var _cloudupResourcesAddonsNetworkingAmazonVpcRoutedEniK8s116YamlTemplate = []by - "name": "{{ .Name }}" "value": "{{ .Value }}" {{- end }} - "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.6" }}" + "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.7" }}" "imagePullPolicy": "Always" "livenessProbe": "exec": @@ -29787,7 +29787,7 @@ var _cloudupResourcesAddonsNetworkingAmazonVpcRoutedEniK8s116YamlTemplate = []by - "env": - "name": "DISABLE_TCP_EARLY_DEMUX" "value": "false" - "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.6" + "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.7" "imagePullPolicy": "Always" "name": "aws-vpc-cni-init" "securityContext": 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 a079b140c5..5a45850c04 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 @@ -148,7 +148,7 @@ - "name": "{{ .Name }}" "value": "{{ .Value }}" {{- end }} - "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.6" }}" + "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.7" }}" "imagePullPolicy": "Always" "livenessProbe": "exec": @@ -191,7 +191,7 @@ - "env": - "name": "DISABLE_TCP_EARLY_DEMUX" "value": "false" - "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.6" + "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.7" "imagePullPolicy": "Always" "name": "aws-vpc-cni-init" "securityContext": diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 0df51949d5..6d7dddff0d 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -79,7 +79,7 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0' manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: c88d304c66eb22f75ea910973a372f1ea3c2753b + manifestHash: 3d6e78dd6589bb6a6ef4ede3d99a2c9ec9b9f037 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 d08f1697b5..eecfd24a3f 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 @@ -151,7 +151,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.7.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.7 imagePullPolicy: Always livenessProbe: exec: @@ -194,7 +194,7 @@ spec: - env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.6 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.7 imagePullPolicy: Always name: aws-vpc-cni-init securityContext: