Skip to content

Commit b5c4a9e

Browse files
Update aws-node to v1.23.0 (#8832)
* update aws-node to v1.23.0 * test: Update expected aws-network-policy-agent version The manifest in this update moves aws-network-policy-agent from v1.4.0 to v1.4.1 alongside the VPC CNI bump, but update_aws_node.sh only syncs expectedVersion, so expectedNodeAgentVersion was left behind and the two specs asserting the sidecar image failed with v1.4.1 != v1.4.0. #8834 fixes the generator so this stays in step by itself. This commit unblocks the current update, which was generated before that change. --------- Co-authored-by: gustavodiaz7722 <38817851+gustavodiaz7722@users.noreply.github.com> Co-authored-by: Gustavo Diaz <gustidia@amazon.com>
1 parent 9561c7f commit b5c4a9e

2 files changed

Lines changed: 16 additions & 15 deletions

File tree

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ metadata:
6666
app.kubernetes.io/name: aws-node
6767
app.kubernetes.io/instance: aws-vpc-cni
6868
k8s-app: aws-node
69-
app.kubernetes.io/version: "v1.22.4"
69+
app.kubernetes.io/version: "v1.23.0"
7070
---
7171
# Source: aws-vpc-cni/templates/configmap.yaml
7272
apiVersion: v1
@@ -78,7 +78,7 @@ metadata:
7878
app.kubernetes.io/name: aws-node
7979
app.kubernetes.io/instance: aws-vpc-cni
8080
k8s-app: aws-node
81-
app.kubernetes.io/version: "v1.22.4"
81+
app.kubernetes.io/version: "v1.23.0"
8282
data:
8383
enable-windows-ipam: "false"
8484
enable-network-policy-controller: "false"
@@ -97,7 +97,7 @@ metadata:
9797
app.kubernetes.io/name: aws-node
9898
app.kubernetes.io/instance: aws-vpc-cni
9999
k8s-app: aws-node
100-
app.kubernetes.io/version: "v1.22.4"
100+
app.kubernetes.io/version: "v1.23.0"
101101
rules:
102102
- apiGroups:
103103
- crd.k8s.amazonaws.com
@@ -147,7 +147,7 @@ metadata:
147147
app.kubernetes.io/name: aws-node
148148
app.kubernetes.io/instance: aws-vpc-cni
149149
k8s-app: aws-node
150-
app.kubernetes.io/version: "v1.22.4"
150+
app.kubernetes.io/version: "v1.23.0"
151151
roleRef:
152152
apiGroup: rbac.authorization.k8s.io
153153
kind: ClusterRole
@@ -167,7 +167,7 @@ metadata:
167167
app.kubernetes.io/name: aws-node
168168
app.kubernetes.io/instance: aws-vpc-cni
169169
k8s-app: aws-node
170-
app.kubernetes.io/version: "v1.22.4"
170+
app.kubernetes.io/version: "v1.23.0"
171171
spec:
172172
updateStrategy:
173173
rollingUpdate:
@@ -188,8 +188,8 @@ spec:
188188
hostNetwork: true
189189
initContainers:
190190
- name: aws-vpc-cni-init
191-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.22.4
192-
imagePullPolicy: Always
191+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.23.0
192+
imagePullPolicy: IfNotPresent
193193
env:
194194
- name: DISABLE_TCP_EARLY_DEMUX
195195
value: "false"
@@ -210,15 +210,16 @@ spec:
210210
{}
211211
containers:
212212
- name: aws-node
213-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.22.4
213+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.23.0
214+
imagePullPolicy: IfNotPresent
214215
ports:
215216
- containerPort: 61678
216217
name: metrics
217218
livenessProbe:
218219
exec:
219220
command:
220221
- /app/grpc-health-probe
221-
- -addr=:50051
222+
- -addr=unix:///var/run/aws-node/ipamd.sock
222223
- -connect-timeout=5s
223224
- -rpc-timeout=5s
224225
initialDelaySeconds: 60
@@ -227,7 +228,7 @@ spec:
227228
exec:
228229
command:
229230
- /app/grpc-health-probe
230-
- -addr=:50051
231+
- -addr=unix:///var/run/aws-node/ipamd.sock
231232
- -connect-timeout=5s
232233
- -rpc-timeout=5s
233234
initialDelaySeconds: 1
@@ -278,7 +279,7 @@ spec:
278279
- name: NETWORK_POLICY_ENFORCING_MODE
279280
value: "standard"
280281
- name: VPC_CNI_VERSION
281-
value: "v1.22.4"
282+
value: "v1.23.0"
282283
- name: WARM_ENI_TARGET
283284
value: "1"
284285
- name: WARM_PREFIX_TARGET
@@ -313,8 +314,8 @@ spec:
313314
- mountPath: /run/xtables.lock
314315
name: xtables-lock
315316
- name: aws-eks-nodeagent
316-
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.4.0
317-
imagePullPolicy: Always
317+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.4.1
318+
imagePullPolicy: IfNotPresent
318319
ports:
319320
- containerPort: 8162
320321
name: agentmetrics

pkg/addons/default/aws_node_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ var _ = Describe("AWS Node", func() {
6161

6262
Describe("UpdateAWSNode", func() {
6363
var preUpdateAwsNode *v1.DaemonSet
64-
const expectedVersion = "v1.22.4"
65-
const expectedNodeAgentVersion = "v1.4.0"
64+
const expectedVersion = "v1.23.0"
65+
const expectedNodeAgentVersion = "v1.4.1"
6666
BeforeEach(func() {
6767
loadSamples(rawClient, "testdata/sample-1.15.json")
6868

0 commit comments

Comments
 (0)