kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9408 from MoShitrit/upgrade-aws-cni 

Upgrade Amazon VPC CNI to 1.6.3
This commit is contained in:
Kubernetes Prow Robot 2020-06-19 16:12:40 -07:00 committed by GitHub
parent ff94f4a791 1c1044bd69
commit cb0333a75c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/models/bindata.go
View File

@ -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

2
upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
View File

@ -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

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -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"

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -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: