diff --git a/upup/models/bindata.go b/upup/models/bindata.go index 0c4c9cf895856..f65d3e70c7939 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -30893,7 +30893,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.8" }}" + "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.9" }}" "imagePullPolicy": "Always" "livenessProbe": "exec": @@ -30936,7 +30936,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.8" + "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.9" "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 437ff0e30fde2..b087f0f90d2db 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.8" }}" + "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.9" }}" "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.8" + "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.9" "imagePullPolicy": "Always" "name": "aws-vpc-cni-init" "securityContext": 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 acc562d3b2974..0439bc22332d4 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/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: 9ee6f14c2919f1744bd3ef7c8a01ff3c4a111511 + manifestHash: 9d7b0aa5ab3df0170b85b53b9c4e087216d5ddeb name: networking.amazon-vpc-routed-eni selector: role.kubernetes.io/networking: "1" 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 307ca6cb3e6b7..89fb383c98443 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 @@ -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.8 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.9 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.8 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.9 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 9ccc7ebae7784..a9ad7828588df 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: 4939462053b97b341540edcb525d6064ce8567de + manifestHash: bf1e49b5c32bf7e5af85266c8b17b848f8c965e1 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 bcbb6b04e0115..cafbeefffd678 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.8 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.9 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.8 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.9 imagePullPolicy: Always name: aws-vpc-cni-init securityContext: