Skip to content

Commit 76dd043

Browse files
Update aws-node to v1.20.0 (#8426)
update aws-node to v1.20.0 Co-authored-by: michaelbeaumont <[email protected]>
1 parent 70c8135 commit 76dd043

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

pkg/addons/default/assets/aws-node.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ metadata:
300300
app.kubernetes.io/name: aws-node
301301
app.kubernetes.io/instance: aws-vpc-cni
302302
k8s-app: aws-node
303-
app.kubernetes.io/version: "v1.19.5"
303+
app.kubernetes.io/version: "v1.20.0"
304304
---
305305
# Source: aws-vpc-cni/templates/configmap.yaml
306306
apiVersion: v1
@@ -312,7 +312,7 @@ metadata:
312312
app.kubernetes.io/name: aws-node
313313
app.kubernetes.io/instance: aws-vpc-cni
314314
k8s-app: aws-node
315-
app.kubernetes.io/version: "v1.19.5"
315+
app.kubernetes.io/version: "v1.20.0"
316316
data:
317317
enable-windows-ipam: "false"
318318
enable-network-policy-controller: "false"
@@ -331,7 +331,7 @@ metadata:
331331
app.kubernetes.io/name: aws-node
332332
app.kubernetes.io/instance: aws-vpc-cni
333333
k8s-app: aws-node
334-
app.kubernetes.io/version: "v1.19.5"
334+
app.kubernetes.io/version: "v1.20.0"
335335
rules:
336336
- apiGroups:
337337
- crd.k8s.amazonaws.com
@@ -377,7 +377,7 @@ metadata:
377377
app.kubernetes.io/name: aws-node
378378
app.kubernetes.io/instance: aws-vpc-cni
379379
k8s-app: aws-node
380-
app.kubernetes.io/version: "v1.19.5"
380+
app.kubernetes.io/version: "v1.20.0"
381381
roleRef:
382382
apiGroup: rbac.authorization.k8s.io
383383
kind: ClusterRole
@@ -397,7 +397,7 @@ metadata:
397397
app.kubernetes.io/name: aws-node
398398
app.kubernetes.io/instance: aws-vpc-cni
399399
k8s-app: aws-node
400-
app.kubernetes.io/version: "v1.19.5"
400+
app.kubernetes.io/version: "v1.20.0"
401401
spec:
402402
updateStrategy:
403403
rollingUpdate:
@@ -418,7 +418,7 @@ spec:
418418
hostNetwork: true
419419
initContainers:
420420
- name: aws-vpc-cni-init
421-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.5
421+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.0
422422
imagePullPolicy: Always
423423
env:
424424
- name: DISABLE_TCP_EARLY_DEMUX
@@ -440,7 +440,7 @@ spec:
440440
{}
441441
containers:
442442
- name: aws-node
443-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.5
443+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.0
444444
ports:
445445
- containerPort: 61678
446446
name: metrics
@@ -491,10 +491,14 @@ spec:
491491
value: "false"
492492
- name: DISABLE_NETWORK_RESOURCE_PROVISIONING
493493
value: "false"
494+
- name: ENABLE_IMDS_ONLY_MODE
495+
value: "false"
494496
- name: ENABLE_IPv4
495497
value: "true"
496498
- name: ENABLE_IPv6
497499
value: "false"
500+
- name: ENABLE_MULTI_NIC
501+
value: "false"
498502
- name: ENABLE_POD_ENI
499503
value: "false"
500504
- name: ENABLE_PREFIX_DELEGATION
@@ -504,7 +508,7 @@ spec:
504508
- name: NETWORK_POLICY_ENFORCING_MODE
505509
value: "standard"
506510
- name: VPC_CNI_VERSION
507-
value: "v1.19.5"
511+
value: "v1.20.0"
508512
- name: WARM_ENI_TARGET
509513
value: "1"
510514
- name: WARM_PREFIX_TARGET
@@ -539,7 +543,7 @@ spec:
539543
- mountPath: /run/xtables.lock
540544
name: xtables-lock
541545
- name: aws-eks-nodeagent
542-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.1
546+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.2.3
543547
imagePullPolicy: Always
544548
ports:
545549
- containerPort: 8162
@@ -559,6 +563,7 @@ spec:
559563
- --metrics-bind-addr=:8162
560564
- --health-probe-bind-addr=:8163
561565
- --conntrack-cache-cleanup-period=300
566+
- --log-level=debug
562567
resources:
563568
requests:
564569
cpu: 25m

pkg/addons/default/aws_node_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ var _ = Describe("AWS Node", func() {
6161

6262
Describe("UpdateAWSNode", func() {
6363
var preUpdateAwsNode *v1.DaemonSet
64-
const expectedVersion = "v1.19.5"
64+
const expectedVersion = "v1.20.0"
6565
BeforeEach(func() {
6666
loadSamples(rawClient, "testdata/sample-1.15.json")
6767

0 commit comments

Comments
 (0)