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

Merge pull request #12065 from MoShitrit/aws-cni-1.9.0 

Update AWS CNI to v1.9.0
This commit is contained in:
Kubernetes Prow Robot 2021-07-28 23:04:19 -07:00 committed by GitHub
parent 40c55ac584 13a489571b
commit 8c5c8018db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
View File

@ -71,7 +71,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 2032b7e829e97fcd03df4d281c1c2e075c4f1b0c
manifestHash: 7e7e8107d1a8cf34add80b9c026aad6e21e0e144
name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all
selector:

4
tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -136,7 +136,7 @@ spec:
fieldPath: spec.nodeName
- name: CLUSTER_NAME
value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.0
imagePullPolicy: Always
livenessProbe:
exec:
@ -179,7 +179,7 @@ spec:
- env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.8.0
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.0
imagePullPolicy: Always
name: aws-vpc-cni-init
securityContext:

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

@ -1,4 +1,4 @@
# Vendored from https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/release-1.7/config/v1.7/aws-k8s-cni.yaml
# Vendored from https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/release-1.9/config/v1.9/aws-k8s-cni.yaml
---
"apiVersion": "rbac.authorization.k8s.io/v1"
@ -142,15 +142,19 @@
# "value": "false"
# - "name": "ENABLE_POD_ENI"
# "value": "false"
# - "name": "ENABLE_PREFIX_DELEGATION"
# "value": "false"
- "name": "MY_NODE_NAME"
"valueFrom":
"fieldRef":
"fieldPath": "spec.nodeName"
# - "name": "WARM_ENI_TARGET"
# "value": "1"
# - "name": "WARM_PREFIX_TARGET"
# "value": "1"
- "name": "CLUSTER_NAME"
"value": "{{ ClusterName }}"
"image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0" }}"
"image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.0" }}"
"imagePullPolicy": "Always"
"livenessProbe":
"exec":
@ -193,7 +197,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.8.0" }}"
"image": "{{- or .Networking.AmazonVPC.InitImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.0" }}"
"imagePullPolicy": "Always"
"name": "aws-vpc-cni-init"
"securityContext":

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

@ -47,7 +47,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 59003e93dc5c20d23a61d44e82a4048cd251af00
manifestHash: 27896afb4023ea5dc4081806a3bdb17821982da4
name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all
selector:

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

@ -140,7 +140,7 @@ spec:
fieldPath: spec.nodeName
- name: CLUSTER_NAME
value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.0
imagePullPolicy: Always
livenessProbe:
exec:
@ -183,7 +183,7 @@ spec:
- env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.8.0
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.0
imagePullPolicy: Always
name: aws-vpc-cni-init
securityContext:

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

@ -47,7 +47,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 59003e93dc5c20d23a61d44e82a4048cd251af00
manifestHash: 27896afb4023ea5dc4081806a3bdb17821982da4
name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all
selector:

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

@ -140,7 +140,7 @@ spec:
fieldPath: spec.nodeName
- name: CLUSTER_NAME
value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.0
imagePullPolicy: Always
livenessProbe:
exec:
@ -183,7 +183,7 @@ spec:
- env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.8.0
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.0
imagePullPolicy: Always
name: aws-vpc-cni-init
securityContext: