Skip to content

Commit 525bb5f

Browse files
Update aws-node to v1.19.2 (#7899)
update aws-node to v1.19.2 Co-authored-by: michaelbeaumont <[email protected]>
1 parent 5c7f9a1 commit 525bb5f

File tree

2 files changed

+50
-10
lines changed

2 files changed

+50
-10
lines changed

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

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,40 @@ spec:
1616
openAPIV3Schema:
1717
type: object
1818
x-kubernetes-preserve-unknown-fields: true
19+
description: ENIConfig is the Schema for the eniconfigs API
20+
properties:
21+
apiVersion:
22+
description: |-
23+
APIVersion defines the versioned schema of this representation of an object.
24+
Servers should convert recognized schemas to the latest internal value, and
25+
may reject unrecognized values.
26+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
27+
type: string
28+
kind:
29+
description: |-
30+
Kind is a string value representing the REST resource this object represents.
31+
Servers may infer this from the endpoint the client submits requests to.
32+
Cannot be updated.
33+
In CamelCase.
34+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
35+
type: string
36+
metadata:
37+
type: object
38+
spec:
39+
description: ENIConfigSpec defines the desired state of ENIConfig
40+
properties:
41+
securityGroups:
42+
items:
43+
type: string
44+
type: array
45+
subnet:
46+
type: string
47+
required:
48+
- subnet
49+
type: object
50+
status:
51+
description: ENIConfigStatus defines the observed state of ENIConfig
52+
type: object
1953
names:
2054
plural: eniconfigs
2155
singular: eniconfig
@@ -266,7 +300,7 @@ metadata:
266300
app.kubernetes.io/name: aws-node
267301
app.kubernetes.io/instance: aws-vpc-cni
268302
k8s-app: aws-node
269-
app.kubernetes.io/version: "v1.18.1"
303+
app.kubernetes.io/version: "v1.19.2"
270304
---
271305
# Source: aws-vpc-cni/templates/configmap.yaml
272306
apiVersion: v1
@@ -278,7 +312,7 @@ metadata:
278312
app.kubernetes.io/name: aws-node
279313
app.kubernetes.io/instance: aws-vpc-cni
280314
k8s-app: aws-node
281-
app.kubernetes.io/version: "v1.18.1"
315+
app.kubernetes.io/version: "v1.19.2"
282316
data:
283317
enable-windows-ipam: "false"
284318
enable-network-policy-controller: "false"
@@ -297,7 +331,7 @@ metadata:
297331
app.kubernetes.io/name: aws-node
298332
app.kubernetes.io/instance: aws-vpc-cni
299333
k8s-app: aws-node
300-
app.kubernetes.io/version: "v1.18.1"
334+
app.kubernetes.io/version: "v1.19.2"
301335
rules:
302336
- apiGroups:
303337
- crd.k8s.amazonaws.com
@@ -343,7 +377,7 @@ metadata:
343377
app.kubernetes.io/name: aws-node
344378
app.kubernetes.io/instance: aws-vpc-cni
345379
k8s-app: aws-node
346-
app.kubernetes.io/version: "v1.18.1"
380+
app.kubernetes.io/version: "v1.19.2"
347381
roleRef:
348382
apiGroup: rbac.authorization.k8s.io
349383
kind: ClusterRole
@@ -363,7 +397,7 @@ metadata:
363397
app.kubernetes.io/name: aws-node
364398
app.kubernetes.io/instance: aws-vpc-cni
365399
k8s-app: aws-node
366-
app.kubernetes.io/version: "v1.18.1"
400+
app.kubernetes.io/version: "v1.19.2"
367401
spec:
368402
updateStrategy:
369403
rollingUpdate:
@@ -384,7 +418,8 @@ spec:
384418
hostNetwork: true
385419
initContainers:
386420
- name: aws-vpc-cni-init
387-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.18.1
421+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.2
422+
imagePullPolicy: Always
388423
env:
389424
- name: DISABLE_TCP_EARLY_DEMUX
390425
value: "false"
@@ -405,7 +440,7 @@ spec:
405440
{}
406441
containers:
407442
- name: aws-node
408-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.1
443+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.2
409444
ports:
410445
- containerPort: 61678
411446
name: metrics
@@ -469,7 +504,7 @@ spec:
469504
- name: NETWORK_POLICY_ENFORCING_MODE
470505
value: "standard"
471506
- name: VPC_CNI_VERSION
472-
value: "v1.18.1"
507+
value: "v1.19.2"
473508
- name: WARM_ENI_TARGET
474509
value: "1"
475510
- name: WARM_PREFIX_TARGET
@@ -504,7 +539,8 @@ spec:
504539
- mountPath: /run/xtables.lock
505540
name: xtables-lock
506541
- name: aws-eks-nodeagent
507-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.1
542+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.6
543+
imagePullPolicy: Always
508544
env:
509545
- name: MY_NODE_NAME
510546
valueFrom:
@@ -516,6 +552,7 @@ spec:
516552
- --enable-network-policy=false
517553
- --enable-cloudwatch-logs=false
518554
- --enable-policy-event-logs=false
555+
- --log-file=/var/log/aws-routed-eni/network-policy-agent.log
519556
- --metrics-bind-addr=:8162
520557
- --health-probe-bind-addr=:8163
521558
- --conntrack-cache-cleanup-period=300
@@ -557,6 +594,7 @@ spec:
557594
- name: xtables-lock
558595
hostPath:
559596
path: /run/xtables.lock
597+
type: FileOrCreate
560598
affinity:
561599
nodeAffinity:
562600
requiredDuringSchedulingIgnoredDuringExecution:
@@ -575,3 +613,5 @@ spec:
575613
operator: NotIn
576614
values:
577615
- fargate
616+
- hybrid
617+
- auto

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.18.1"
64+
const expectedVersion = "v1.19.2"
6565
BeforeEach(func() {
6666
loadSamples(rawClient, "testdata/sample-1.15.json")
6767

0 commit comments

Comments
 (0)