Skip to content

Commit 01b5aac

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17783 from moshevayner/aws-vpc-cni-1.20.5
chore(upup): bump aws-cni to 1.20.5
2 parents 772055b + cda9d99 commit 01b5aac

11 files changed

+55
-50
lines changed

‎tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ spec:
177177
version: 9.99.0
178178
- id: k8s-1.16
179179
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
180-
manifestHash: a7204ce0e25cd7216cbab13c9c6b19625298f0d3e5f1be12b75c3aa173f7a91e
180+
manifestHash: 547fe3078d1f6c07f32d82c758252f9eb523f4a245d97267541250f7fbf2f14c
181181
name: networking.amazon-vpc-routed-eni
182182
needsRollingUpdate: all
183183
selector:

‎tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ metadata:
306306
app.kubernetes.io/instance: aws-vpc-cni
307307
app.kubernetes.io/managed-by: kops
308308
app.kubernetes.io/name: aws-node
309-
app.kubernetes.io/version: v1.20.2
309+
app.kubernetes.io/version: v1.20.5
310310
k8s-app: aws-node
311311
role.kubernetes.io/networking: "1"
312312
name: aws-node
@@ -330,7 +330,7 @@ metadata:
330330
app.kubernetes.io/instance: aws-vpc-cni
331331
app.kubernetes.io/managed-by: kops
332332
app.kubernetes.io/name: aws-node
333-
app.kubernetes.io/version: v1.20.2
333+
app.kubernetes.io/version: v1.20.5
334334
k8s-app: aws-node
335335
role.kubernetes.io/networking: "1"
336336
name: amazon-vpc-cni
@@ -346,7 +346,7 @@ metadata:
346346
app.kubernetes.io/instance: aws-vpc-cni
347347
app.kubernetes.io/managed-by: kops
348348
app.kubernetes.io/name: aws-node
349-
app.kubernetes.io/version: v1.20.2
349+
app.kubernetes.io/version: v1.20.5
350350
k8s-app: aws-node
351351
role.kubernetes.io/networking: "1"
352352
name: aws-node
@@ -426,7 +426,7 @@ metadata:
426426
app.kubernetes.io/instance: aws-vpc-cni
427427
app.kubernetes.io/managed-by: kops
428428
app.kubernetes.io/name: aws-node
429-
app.kubernetes.io/version: v1.20.2
429+
app.kubernetes.io/version: v1.20.5
430430
k8s-app: aws-node
431431
role.kubernetes.io/networking: "1"
432432
name: aws-node
@@ -449,7 +449,7 @@ metadata:
449449
app.kubernetes.io/instance: aws-vpc-cni
450450
app.kubernetes.io/managed-by: kops
451451
app.kubernetes.io/name: aws-node
452-
app.kubernetes.io/version: v1.20.2
452+
app.kubernetes.io/version: v1.20.5
453453
k8s-app: aws-node
454454
role.kubernetes.io/networking: "1"
455455
name: aws-node
@@ -548,7 +548,7 @@ spec:
548548
fieldPath: metadata.name
549549
- name: CLUSTER_NAME
550550
value: minimal.example.com
551-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2
551+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.5
552552
livenessProbe:
553553
exec:
554554
command:
@@ -606,7 +606,7 @@ spec:
606606
fieldRef:
607607
apiVersion: v1
608608
fieldPath: spec.nodeName
609-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6
609+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.7
610610
imagePullPolicy: IfNotPresent
611611
name: aws-eks-nodeagent
612612
ports:
@@ -636,7 +636,7 @@ spec:
636636
value: "false"
637637
- name: ENABLE_IPv6
638638
value: "false"
639-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2
639+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.5
640640
imagePullPolicy: IfNotPresent
641641
name: aws-vpc-cni-init
642642
resources:

‎tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ spec:
177177
version: 9.99.0
178178
- id: k8s-1.16
179179
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
180-
manifestHash: 063517c57f78b9a1ca59bc00cb58be27f8df5e9b071728e6adc07a8df5946c85
180+
manifestHash: 846cc830a15ff3b2ae2ebbec425df7e1f801f1e60d2e5f8c2a67d15ccb43b4ea
181181
name: networking.amazon-vpc-routed-eni
182182
needsRollingUpdate: all
183183
selector:

‎tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ metadata:
306306
app.kubernetes.io/instance: aws-vpc-cni
307307
app.kubernetes.io/managed-by: kops
308308
app.kubernetes.io/name: aws-node
309-
app.kubernetes.io/version: v1.20.2
309+
app.kubernetes.io/version: v1.20.5
310310
k8s-app: aws-node
311311
role.kubernetes.io/networking: "1"
312312
name: aws-node
@@ -330,7 +330,7 @@ metadata:
330330
app.kubernetes.io/instance: aws-vpc-cni
331331
app.kubernetes.io/managed-by: kops
332332
app.kubernetes.io/name: aws-node
333-
app.kubernetes.io/version: v1.20.2
333+
app.kubernetes.io/version: v1.20.5
334334
k8s-app: aws-node
335335
role.kubernetes.io/networking: "1"
336336
name: amazon-vpc-cni
@@ -346,7 +346,7 @@ metadata:
346346
app.kubernetes.io/instance: aws-vpc-cni
347347
app.kubernetes.io/managed-by: kops
348348
app.kubernetes.io/name: aws-node
349-
app.kubernetes.io/version: v1.20.2
349+
app.kubernetes.io/version: v1.20.5
350350
k8s-app: aws-node
351351
role.kubernetes.io/networking: "1"
352352
name: aws-node
@@ -426,7 +426,7 @@ metadata:
426426
app.kubernetes.io/instance: aws-vpc-cni
427427
app.kubernetes.io/managed-by: kops
428428
app.kubernetes.io/name: aws-node
429-
app.kubernetes.io/version: v1.20.2
429+
app.kubernetes.io/version: v1.20.5
430430
k8s-app: aws-node
431431
role.kubernetes.io/networking: "1"
432432
name: aws-node
@@ -449,7 +449,7 @@ metadata:
449449
app.kubernetes.io/instance: aws-vpc-cni
450450
app.kubernetes.io/managed-by: kops
451451
app.kubernetes.io/name: aws-node
452-
app.kubernetes.io/version: v1.20.2
452+
app.kubernetes.io/version: v1.20.5
453453
k8s-app: aws-node
454454
role.kubernetes.io/networking: "1"
455455
name: aws-node

‎tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ spec:
226226
version: 9.99.0
227227
- id: k8s-1.16
228228
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
229-
manifestHash: 8b3c3de579568b69eed4c682ab1c3940e696e8498f00f8c9e28d9474982baf31
229+
manifestHash: 8f097917ecd67db07ef98513c83703859430bf6a72f895c2f6fed160b156e4d8
230230
name: networking.amazon-vpc-routed-eni
231231
needsRollingUpdate: all
232232
selector:

‎tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ metadata:
306306
app.kubernetes.io/instance: aws-vpc-cni
307307
app.kubernetes.io/managed-by: kops
308308
app.kubernetes.io/name: aws-node
309-
app.kubernetes.io/version: v1.20.2
309+
app.kubernetes.io/version: v1.20.5
310310
k8s-app: aws-node
311311
role.kubernetes.io/networking: "1"
312312
name: aws-node
@@ -330,7 +330,7 @@ metadata:
330330
app.kubernetes.io/instance: aws-vpc-cni
331331
app.kubernetes.io/managed-by: kops
332332
app.kubernetes.io/name: aws-node
333-
app.kubernetes.io/version: v1.20.2
333+
app.kubernetes.io/version: v1.20.5
334334
k8s-app: aws-node
335335
role.kubernetes.io/networking: "1"
336336
name: amazon-vpc-cni
@@ -346,7 +346,7 @@ metadata:
346346
app.kubernetes.io/instance: aws-vpc-cni
347347
app.kubernetes.io/managed-by: kops
348348
app.kubernetes.io/name: aws-node
349-
app.kubernetes.io/version: v1.20.2
349+
app.kubernetes.io/version: v1.20.5
350350
k8s-app: aws-node
351351
role.kubernetes.io/networking: "1"
352352
name: aws-node
@@ -426,7 +426,7 @@ metadata:
426426
app.kubernetes.io/instance: aws-vpc-cni
427427
app.kubernetes.io/managed-by: kops
428428
app.kubernetes.io/name: aws-node
429-
app.kubernetes.io/version: v1.20.2
429+
app.kubernetes.io/version: v1.20.5
430430
k8s-app: aws-node
431431
role.kubernetes.io/networking: "1"
432432
name: aws-node
@@ -449,7 +449,7 @@ metadata:
449449
app.kubernetes.io/instance: aws-vpc-cni
450450
app.kubernetes.io/managed-by: kops
451451
app.kubernetes.io/name: aws-node
452-
app.kubernetes.io/version: v1.20.2
452+
app.kubernetes.io/version: v1.20.5
453453
k8s-app: aws-node
454454
role.kubernetes.io/networking: "1"
455455
name: aws-node
@@ -548,7 +548,7 @@ spec:
548548
fieldPath: metadata.name
549549
- name: CLUSTER_NAME
550550
value: many-addons.example.com
551-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2
551+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.5
552552
livenessProbe:
553553
exec:
554554
command:
@@ -606,7 +606,7 @@ spec:
606606
fieldRef:
607607
apiVersion: v1
608608
fieldPath: spec.nodeName
609-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6
609+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.7
610610
imagePullPolicy: IfNotPresent
611611
name: aws-eks-nodeagent
612612
ports:
@@ -636,7 +636,7 @@ spec:
636636
value: "false"
637637
- name: ENABLE_IPv6
638638
value: "false"
639-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2
639+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.5
640640
imagePullPolicy: IfNotPresent
641641
name: aws-vpc-cni-init
642642
resources:

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ spec:
289289
storage: true
290290
subresources:
291291
status: {}
292+
292293
---
293294
# Source: aws-vpc-cni/templates/serviceaccount.yaml
294295
apiVersion: v1
@@ -300,7 +301,7 @@ metadata:
300301
app.kubernetes.io/name: aws-node
301302
app.kubernetes.io/instance: aws-vpc-cni
302303
k8s-app: aws-node
303-
app.kubernetes.io/version: "v1.20.2"
304+
app.kubernetes.io/version: "v1.20.5"
304305
---
305306
# Source: aws-vpc-cni/templates/configmap.yaml
306307
apiVersion: v1
@@ -312,7 +313,7 @@ metadata:
312313
app.kubernetes.io/name: aws-node
313314
app.kubernetes.io/instance: aws-vpc-cni
314315
k8s-app: aws-node
315-
app.kubernetes.io/version: "v1.20.2"
316+
app.kubernetes.io/version: "v1.20.5"
316317
data:
317318
enable-windows-ipam: "false"
318319
enable-network-policy-controller: "false"
@@ -331,7 +332,7 @@ metadata:
331332
app.kubernetes.io/name: aws-node
332333
app.kubernetes.io/instance: aws-vpc-cni
333334
k8s-app: aws-node
334-
app.kubernetes.io/version: "v1.20.2"
335+
app.kubernetes.io/version: "v1.20.5"
335336
rules:
336337
- apiGroups:
337338
- crd.k8s.amazonaws.com
@@ -384,7 +385,7 @@ metadata:
384385
app.kubernetes.io/name: aws-node
385386
app.kubernetes.io/instance: aws-vpc-cni
386387
k8s-app: aws-node
387-
app.kubernetes.io/version: "v1.20.2"
388+
app.kubernetes.io/version: "v1.20.5"
388389
roleRef:
389390
apiGroup: rbac.authorization.k8s.io
390391
kind: ClusterRole
@@ -404,7 +405,7 @@ metadata:
404405
app.kubernetes.io/name: aws-node
405406
app.kubernetes.io/instance: aws-vpc-cni
406407
k8s-app: aws-node
407-
app.kubernetes.io/version: "v1.20.2"
408+
app.kubernetes.io/version: "v1.20.5"
408409
spec:
409410
updateStrategy:
410411
rollingUpdate:
@@ -425,7 +426,7 @@ spec:
425426
hostNetwork: true
426427
initContainers:
427428
- name: aws-vpc-cni-init
428-
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2" }}"
429+
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.5" }}"
429430
imagePullPolicy: IfNotPresent
430431
env:
431432
- name: DISABLE_TCP_EARLY_DEMUX
@@ -451,7 +452,7 @@ spec:
451452
{{ end }}
452453
containers:
453454
- name: aws-node
454-
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2" }}"
455+
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.5" }}"
455456
ports:
456457
- containerPort: 61678
457458
name: metrics
@@ -508,10 +509,14 @@ spec:
508509
# value: "false"
509510
# - name: DISABLE_NETWORK_RESOURCE_PROVISIONING
510511
# value: "false"
512+
# - name: ENABLE_IMDS_ONLY_MODE
513+
# value: "false"
511514
# - name: ENABLE_IPv4
512515
# value: "true"
513516
# - name: ENABLE_IPv6
514517
# value: "false"
518+
# - name: ENABLE_MULTI_NIC
519+
# value: "false"
515520
# - name: ENABLE_POD_ENI
516521
# value: "false"
517522
# - name: ENABLE_PREFIX_DELEGATION
@@ -558,7 +563,7 @@ spec:
558563
- mountPath: /run/xtables.lock
559564
name: xtables-lock
560565
- name: aws-eks-nodeagent
561-
image: "{{- or .Networking.AmazonVPC.NetworkPolicyAgentImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6" }}"
566+
image: "{{- or .Networking.AmazonVPC.NetworkPolicyAgentImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.7" }}"
562567
imagePullPolicy: IfNotPresent
563568
ports:
564569
- containerPort: 8162

‎upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ spec:
9898
version: 9.99.0
9999
- id: k8s-1.16
100100
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
101-
manifestHash: 42db812bfe7603cf28fe6eec90bb939b015e848751f43825ae532fc8b7a04111
101+
manifestHash: f4fa23eb0e6f35be3b4cd4269e175617a71a940ca2653d2864fddc63e570e2eb
102102
name: networking.amazon-vpc-routed-eni
103103
needsRollingUpdate: all
104104
selector:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ metadata:
306306
app.kubernetes.io/instance: aws-vpc-cni
307307
app.kubernetes.io/managed-by: kops
308308
app.kubernetes.io/name: aws-node
309-
app.kubernetes.io/version: v1.20.2
309+
app.kubernetes.io/version: v1.20.5
310310
k8s-app: aws-node
311311
role.kubernetes.io/networking: "1"
312312
name: aws-node
@@ -330,7 +330,7 @@ metadata:
330330
app.kubernetes.io/instance: aws-vpc-cni
331331
app.kubernetes.io/managed-by: kops
332332
app.kubernetes.io/name: aws-node
333-
app.kubernetes.io/version: v1.20.2
333+
app.kubernetes.io/version: v1.20.5
334334
k8s-app: aws-node
335335
role.kubernetes.io/networking: "1"
336336
name: amazon-vpc-cni
@@ -346,7 +346,7 @@ metadata:
346346
app.kubernetes.io/instance: aws-vpc-cni
347347
app.kubernetes.io/managed-by: kops
348348
app.kubernetes.io/name: aws-node
349-
app.kubernetes.io/version: v1.20.2
349+
app.kubernetes.io/version: v1.20.5
350350
k8s-app: aws-node
351351
role.kubernetes.io/networking: "1"
352352
name: aws-node
@@ -426,7 +426,7 @@ metadata:
426426
app.kubernetes.io/instance: aws-vpc-cni
427427
app.kubernetes.io/managed-by: kops
428428
app.kubernetes.io/name: aws-node
429-
app.kubernetes.io/version: v1.20.2
429+
app.kubernetes.io/version: v1.20.5
430430
k8s-app: aws-node
431431
role.kubernetes.io/networking: "1"
432432
name: aws-node
@@ -449,7 +449,7 @@ metadata:
449449
app.kubernetes.io/instance: aws-vpc-cni
450450
app.kubernetes.io/managed-by: kops
451451
app.kubernetes.io/name: aws-node
452-
app.kubernetes.io/version: v1.20.2
452+
app.kubernetes.io/version: v1.20.5
453453
k8s-app: aws-node
454454
role.kubernetes.io/networking: "1"
455455
name: aws-node
@@ -550,7 +550,7 @@ spec:
550550
fieldPath: metadata.name
551551
- name: CLUSTER_NAME
552552
value: minimal.example.com
553-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.2
553+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.5
554554
livenessProbe:
555555
exec:
556556
command:
@@ -608,7 +608,7 @@ spec:
608608
fieldRef:
609609
apiVersion: v1
610610
fieldPath: spec.nodeName
611-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6
611+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.7
612612
imagePullPolicy: IfNotPresent
613613
name: aws-eks-nodeagent
614614
ports:
@@ -638,7 +638,7 @@ spec:
638638
value: "false"
639639
- name: ENABLE_IPv6
640640
value: "false"
641-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.2
641+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.5
642642
imagePullPolicy: IfNotPresent
643643
name: aws-vpc-cni-init
644644
resources:

0 commit comments

Comments
 (0)