From 9e6771118fa14c7d6388ee4929dd57f6ce1d2692 Mon Sep 17 00:00:00 2001 From: Moshe Shitrit Date: Fri, 18 Jun 2021 18:42:03 +0300 Subject: [PATCH 1/2] Update version to 1.8.0 --- .../networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7fab2890b5e06..eb77ce1a5a8bc 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.10" }}" + "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0" }}" "imagePullPolicy": "Always" "livenessProbe": "exec": @@ -191,7 +191,7 @@ - "env": - "name": "DISABLE_TCP_EARLY_DEMUX" "value": "false" - "image": "{{- or .Networking.AmazonVPC.InitImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.10" }}" + "image": "{{- or .Networking.AmazonVPC.InitImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.8.0" }}" "imagePullPolicy": "Always" "name": "aws-vpc-cni-init" "securityContext": From da35c2a6d6eb4d8a503324d10583d49e42fabf9a Mon Sep 17 00:00:00 2001 From: Moshe Shitrit Date: Fri, 18 Jun 2021 18:48:09 +0300 Subject: [PATCH 2/2] update-expected after aws-cni version bump --- .../amazonvpc-containerd/manifest.yaml | 2 +- .../networking.amazon-vpc-routed-eni-k8s-1.16.yaml | 4 ++-- .../tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml | 2 +- .../amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index 22637a7d35972..deb95692f3424 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -54,7 +54,7 @@ spec: version: 1.17.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 997781194bcdfa7602dfb69e2a1f42cb5106fc81 + manifestHash: b89f35a6abb88822739e20ae2ad7776d8160e806 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml index 18a85b78e24b7..e9989b3b2e1f4 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml @@ -174,7 +174,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.10 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0 imagePullPolicy: Always livenessProbe: exec: @@ -217,7 +217,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.10 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.8.0 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 22637a7d35972..deb95692f3424 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -54,7 +54,7 @@ spec: version: 1.17.0 - id: k8s-1.16 manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml - manifestHash: 997781194bcdfa7602dfb69e2a1f42cb5106fc81 + manifestHash: b89f35a6abb88822739e20ae2ad7776d8160e806 name: networking.amazon-vpc-routed-eni needsRollingUpdate: all selector: 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 18a85b78e24b7..e9989b3b2e1f4 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 @@ -174,7 +174,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.10 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0 imagePullPolicy: Always livenessProbe: exec: @@ -217,7 +217,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.10 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.8.0 imagePullPolicy: Always name: aws-vpc-cni-init securityContext: