Skip to content

Commit 965f89f

Browse files
authoredJun 4, 2024··
Changelog and Updated CNI Charts for v1.18.2 Release (#2942)
* Update charts, config for Release v1.18.2. * Updated CNI and Metrics Helper Yaml file. ``` make generate-cni-yaml /local/home/senthilx/go/src/github.com/aws/amazon-vpc-cni-k8s//scripts/generate-cni-yaml.sh % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 15.3M 100 15.3M 0 0 28.4M 0 --:--:-- --:--:-- --:--:-- 28.3M Generated aws-vpc-cni and cni-metrics-helper manifest resources files in: - /local/home/senthilx/go/src/github.com/aws/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.18.2/aws-k8s-cni - /local/home/senthilx/go/src/github.com/aws/amazon-vpc-cni-k8s/scripts/../build/cni-rel-yamls/v1.18.2/cni-metrics-helper ``` * Updated Changelog.
1 parent 6b3beef commit 965f89f

17 files changed

+148
-64
lines changed
 

Diff for: ‎CHANGELOG.md

+40
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,45 @@
11
# Changelog
22

3+
## v1.18.2
4+
5+
* Enhancement - [Improve "cni-metrics-helper" setup experience](https://github.com/aws/amazon-vpc-cni-k8s/pull/2874) (@guessi)
6+
* Enhancement - [Filter Managed ENI.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2895) (@orsenthil)
7+
* Enhancement - [Soak Test for CNI.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2915) (@orsenthil)
8+
* Enhancement - [Switch to counter type metic for awscni_no_available_ip_addresses](https://github.com/aws/amazon-vpc-cni-k8s/pull/2919) (@liptanbiswas)
9+
* Enhancement - [Expose network policy log file location to be configured using helm](https://github.com/aws/amazon-vpc-cni-k8s/pull/2925) (@orsenthil)
10+
11+
* Bugfix - [Add correct labels to CNI metrics chart.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2889) (@orsenthil)
12+
* Bugfix - [Skip Soak Test while running other tests.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2922) (@orsenthil)
13+
14+
* Cleanup - [remove unused Dockerfile](https://github.com/aws/amazon-vpc-cni-k8s/pull/2869) (@sushrk)
15+
* Cleanup - [CHANGELOG, chart, and manifest changes following VPC CNI v1.18.0 release](https://github.com/aws/amazon-vpc-cni-k8s/pull/2876) (@jchen6585)
16+
* Cleanup - [Fix merge conflicts from release-1.18 to master](https://github.com/aws/amazon-vpc-cni-k8s/pull/2881) (@jchen6585)
17+
* Cleanup - [Added information on the build troubleshooting.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2890) (@orsenthil)
18+
* Cleanup - [Remove unused code in vpc cni init and vpc cni binary](https://github.com/aws/amazon-vpc-cni-k8s/pull/2891) (@orsenthil)
19+
* Cleanup - [Merge release-1.18 to master after v1.18.1 release](https://github.com/aws/amazon-vpc-cni-k8s/pull/2914) (@jchen6585)
20+
21+
* Dependency - [Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/2864) (@dependabot)
22+
* Dependency - [Bump github.com/stretchr/testify from 1.8.4 to 1.9.0](https://github.com/aws/amazon-vpc-cni-k8s/pull/2863) (@dependabot)
23+
* Dependency- [Bump github.com/prometheus/common from 0.48.0 to 0.52.2](https://github.com/aws/amazon-vpc-cni-k8s/pull/2866) (@dependabot)i
24+
* Dependency - [Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3](https://github.com/aws/amazon-vpc-cni-k8s/pull/2862) (@dependabot)
25+
* Dependency - [Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent](https://github.com/aws/amazon-vpc-cni-k8s/pull/2859) (@dependabot)
26+
* Dependency - [Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/2860) (@dependabot)
27+
* Dependency - [Update Kops test for 1.30](https://github.com/aws/amazon-vpc-cni-k8s/pull/2868) (@jchen6585)
28+
* Dependency - [Update .go-version to 1.22.2 to fix CVE reports](https://github.com/aws/amazon-vpc-cni-k8s/pull/2870) (@orsenthil)
29+
* Dependency - [Bump golang.org/x/sys from 0.18.0 to 0.19.0 in /test/agent](https://github.com/aws/amazon-vpc-cni-k8s/pull/2898) (@dependabot)
30+
* Dependency - [Update .go-version to fix GO-2024-2824](https://github.com/aws/amazon-vpc-cni-k8s/pull/2911) (@orsenthil)
31+
* Dependency - [Bump github.com/aws/amazon-vpc-resource-controller-k8s from 1.4.1 to 1.5.0](https://github.com/aws/amazon-vpc-cni-k8s/pull/2910) (@dependabot)
32+
* Dependency - [Update ENI Limits.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2920) (@orsenthil)
33+
* Dependency - [Update golang to go1.22.3](https://github.com/aws/amazon-vpc-cni-k8s/pull/2924) (@orsenthil)
34+
* Dependency - [Bump k8s.io/api from 0.29.3 to 0.30.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/2918) (@dependabot)
35+
36+
37+
**New Contributors**
38+
39+
* @kwohlfahrt made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2841
40+
* @guessi made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2874
41+
* @liptanbiswas made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2919
42+
343
## v1.18.1
444

545
* Bug - [Mount /run/xtables.lock as FileOrCreate in Helm chart](https://github.com/aws/amazon-vpc-cni-k8s/pull/2841) (@kwohlfahrt)

Diff for: ‎charts/aws-vpc-cni/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: aws-vpc-cni
33
version: 1.18.1
4-
appVersion: "v1.18.1"
4+
appVersion: "v1.18.2"
55
description: A Helm chart for the AWS VPC CNI
66
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
77
home: https://github.com/aws/amazon-vpc-cni-k8s

Diff for: ‎charts/aws-vpc-cni/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ The following table lists the configurable parameters for this chart and their d
4848
| `minimumWindowsIPTarget`| Minimum IP target value for Windows prefix delegation | `3` |
4949
| `branchENICooldown` | Number of seconds that branch ENIs remain in cooldown | `60` |
5050
| `fullnameOverride` | Override the fullname of the chart | `aws-node` |
51-
| `image.tag` | Image tag | `v1.18.1` |
51+
| `image.tag` | Image tag | `v1.18.2` |
5252
| `image.domain` | ECR repository domain | `amazonaws.com` |
5353
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
5454
| `image.endpoint` | ECR repository endpoint to use. | `ecr` |
5555
| `image.account` | ECR repository account number | `602401143452` |
5656
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
5757
| `image.override` | A custom docker image to use | `nil` |
5858
| `imagePullSecrets` | Docker registry pull secret | `[]` |
59-
| `init.image.tag` | Image tag | `v1.18.1` |
59+
| `init.image.tag` | Image tag | `v1.18.2` |
6060
| `init.image.domain` | ECR repository domain | `amazonaws.com` |
6161
| `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
6262
| `init.image.endpoint` | ECR repository endpoint to use. | `ecr` |
@@ -69,7 +69,7 @@ The following table lists the configurable parameters for this chart and their d
6969
| `originalMatchLabels` | Use the original daemonset matchLabels | `false` |
7070
| `nameOverride` | Override the name of the chart | `aws-node` |
7171
| `nodeAgent.enabled` | If the Node Agent container should be created | `true` |
72-
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.1.1` |
72+
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.1.2` |
7373
| `nodeAgent.image.domain`| ECR repository domain | `amazonaws.com` |
7474
| `nodeAgent.image.region`| ECR repository region to use. Should match your cluster | `us-west-2` |
7575
| `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` |

Diff for: ‎charts/aws-vpc-cni/values.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nameOverride: aws-node
88

99
init:
1010
image:
11-
tag: v1.18.1
11+
tag: v1.18.2
1212
domain: amazonaws.com
1313
region: us-west-2
1414
endpoint: ecr
@@ -27,7 +27,7 @@ init:
2727
nodeAgent:
2828
enabled: true
2929
image:
30-
tag: v1.1.1
30+
tag: v1.1.2
3131
domain: amazonaws.com
3232
region: us-west-2
3333
endpoint: ecr
@@ -51,7 +51,7 @@ nodeAgent:
5151
resources: {}
5252

5353
image:
54-
tag: v1.18.1
54+
tag: v1.18.2
5555
domain: amazonaws.com
5656
region: us-west-2
5757
endpoint: ecr
@@ -85,7 +85,7 @@ env:
8585
ENABLE_IPv4: "true"
8686
ENABLE_IPv6: "false"
8787
ENABLE_SUBNET_DISCOVERY: "true"
88-
VPC_CNI_VERSION: "v1.18.1"
88+
VPC_CNI_VERSION: "v1.18.2"
8989
NETWORK_POLICY_ENFORCING_MODE: "standard"
9090

9191
# this flag enables you to use the match label that was present in the original daemonset deployed by EKS

Diff for: ‎charts/cni-metrics-helper/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: cni-metrics-helper
33
version: 1.18.1
4-
appVersion: v1.18.1
4+
appVersion: v1.18.2
55
description: A Helm chart for the AWS VPC CNI Metrics Helper
66
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
77
home: https://github.com/aws/amazon-vpc-cni-k8s

Diff for: ‎charts/cni-metrics-helper/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following table lists the configurable parameters for this chart and their d
6060
| -------------------------------|---------------------------------------------------------------|-------------------------------------|
6161
| `affinity` | Map of node/pod affinities | `{}` |
6262
| `fullnameOverride` | Override the fullname of the chart | `cni-metrics-helper` |
63-
| `image.tag` | Image tag | `v1.18.1` |
63+
| `image.tag` | Image tag | `v1.18.2` |
6464
| `image.domain` | ECR repository domain | `amazonaws.com` |
6565
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
6666
| `image.account` | ECR repository account number | `602401143452` |

Diff for: ‎charts/cni-metrics-helper/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ nameOverride: cni-metrics-helper
44

55
image:
66
region: us-west-2
7-
tag: v1.18.1
7+
tag: v1.18.2
88
account: "602401143452"
99
domain: "amazonaws.com"
1010
# Set to use custom image

Diff for: ‎config/master/aws-k8s-cni-cn.yaml

+11-9
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ metadata:
266266
app.kubernetes.io/name: aws-node
267267
app.kubernetes.io/instance: aws-vpc-cni
268268
k8s-app: aws-node
269-
app.kubernetes.io/version: "v1.18.1"
269+
app.kubernetes.io/version: "v1.18.2"
270270
---
271271
# Source: aws-vpc-cni/templates/configmap.yaml
272272
apiVersion: v1
@@ -278,7 +278,7 @@ metadata:
278278
app.kubernetes.io/name: aws-node
279279
app.kubernetes.io/instance: aws-vpc-cni
280280
k8s-app: aws-node
281-
app.kubernetes.io/version: "v1.18.1"
281+
app.kubernetes.io/version: "v1.18.2"
282282
data:
283283
enable-windows-ipam: "false"
284284
enable-network-policy-controller: "false"
@@ -297,7 +297,7 @@ metadata:
297297
app.kubernetes.io/name: aws-node
298298
app.kubernetes.io/instance: aws-vpc-cni
299299
k8s-app: aws-node
300-
app.kubernetes.io/version: "v1.18.1"
300+
app.kubernetes.io/version: "v1.18.2"
301301
rules:
302302
- apiGroups:
303303
- crd.k8s.amazonaws.com
@@ -343,7 +343,7 @@ metadata:
343343
app.kubernetes.io/name: aws-node
344344
app.kubernetes.io/instance: aws-vpc-cni
345345
k8s-app: aws-node
346-
app.kubernetes.io/version: "v1.18.1"
346+
app.kubernetes.io/version: "v1.18.2"
347347
roleRef:
348348
apiGroup: rbac.authorization.k8s.io
349349
kind: ClusterRole
@@ -363,7 +363,7 @@ metadata:
363363
app.kubernetes.io/name: aws-node
364364
app.kubernetes.io/instance: aws-vpc-cni
365365
k8s-app: aws-node
366-
app.kubernetes.io/version: "v1.18.1"
366+
app.kubernetes.io/version: "v1.18.2"
367367
spec:
368368
updateStrategy:
369369
rollingUpdate:
@@ -384,7 +384,7 @@ spec:
384384
hostNetwork: true
385385
initContainers:
386386
- name: aws-vpc-cni-init
387-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.18.1
387+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.18.2
388388
env:
389389
- name: DISABLE_TCP_EARLY_DEMUX
390390
value: "false"
@@ -405,7 +405,7 @@ spec:
405405
{}
406406
containers:
407407
- name: aws-node
408-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.18.1
408+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.18.2
409409
ports:
410410
- containerPort: 61678
411411
name: metrics
@@ -469,7 +469,7 @@ spec:
469469
- name: NETWORK_POLICY_ENFORCING_MODE
470470
value: "standard"
471471
- name: VPC_CNI_VERSION
472-
value: "v1.18.1"
472+
value: "v1.18.2"
473473
- name: WARM_ENI_TARGET
474474
value: "1"
475475
- name: WARM_PREFIX_TARGET
@@ -504,7 +504,7 @@ spec:
504504
- mountPath: /run/xtables.lock
505505
name: xtables-lock
506506
- name: aws-eks-nodeagent
507-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.1.1
507+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.1.2
508508
env:
509509
- name: MY_NODE_NAME
510510
valueFrom:
@@ -516,6 +516,7 @@ spec:
516516
- --enable-network-policy=false
517517
- --enable-cloudwatch-logs=false
518518
- --enable-policy-event-logs=false
519+
- --log-file=/var/log/aws-routed-eni/network-policy-agent.log
519520
- --metrics-bind-addr=:8162
520521
- --health-probe-bind-addr=:8163
521522
- --conntrack-cache-cleanup-period=300
@@ -557,6 +558,7 @@ spec:
557558
- name: xtables-lock
558559
hostPath:
559560
path: /run/xtables.lock
561+
type: FileOrCreate
560562
affinity:
561563
nodeAffinity:
562564
requiredDuringSchedulingIgnoredDuringExecution:

Diff for: ‎config/master/aws-k8s-cni-us-gov-east-1.yaml

+11-9
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ metadata:
266266
app.kubernetes.io/name: aws-node
267267
app.kubernetes.io/instance: aws-vpc-cni
268268
k8s-app: aws-node
269-
app.kubernetes.io/version: "v1.18.1"
269+
app.kubernetes.io/version: "v1.18.2"
270270
---
271271
# Source: aws-vpc-cni/templates/configmap.yaml
272272
apiVersion: v1
@@ -278,7 +278,7 @@ metadata:
278278
app.kubernetes.io/name: aws-node
279279
app.kubernetes.io/instance: aws-vpc-cni
280280
k8s-app: aws-node
281-
app.kubernetes.io/version: "v1.18.1"
281+
app.kubernetes.io/version: "v1.18.2"
282282
data:
283283
enable-windows-ipam: "false"
284284
enable-network-policy-controller: "false"
@@ -297,7 +297,7 @@ metadata:
297297
app.kubernetes.io/name: aws-node
298298
app.kubernetes.io/instance: aws-vpc-cni
299299
k8s-app: aws-node
300-
app.kubernetes.io/version: "v1.18.1"
300+
app.kubernetes.io/version: "v1.18.2"
301301
rules:
302302
- apiGroups:
303303
- crd.k8s.amazonaws.com
@@ -343,7 +343,7 @@ metadata:
343343
app.kubernetes.io/name: aws-node
344344
app.kubernetes.io/instance: aws-vpc-cni
345345
k8s-app: aws-node
346-
app.kubernetes.io/version: "v1.18.1"
346+
app.kubernetes.io/version: "v1.18.2"
347347
roleRef:
348348
apiGroup: rbac.authorization.k8s.io
349349
kind: ClusterRole
@@ -363,7 +363,7 @@ metadata:
363363
app.kubernetes.io/name: aws-node
364364
app.kubernetes.io/instance: aws-vpc-cni
365365
k8s-app: aws-node
366-
app.kubernetes.io/version: "v1.18.1"
366+
app.kubernetes.io/version: "v1.18.2"
367367
spec:
368368
updateStrategy:
369369
rollingUpdate:
@@ -384,7 +384,7 @@ spec:
384384
hostNetwork: true
385385
initContainers:
386386
- name: aws-vpc-cni-init
387-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.18.1
387+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.18.2
388388
env:
389389
- name: DISABLE_TCP_EARLY_DEMUX
390390
value: "false"
@@ -405,7 +405,7 @@ spec:
405405
{}
406406
containers:
407407
- name: aws-node
408-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.18.1
408+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.18.2
409409
ports:
410410
- containerPort: 61678
411411
name: metrics
@@ -469,7 +469,7 @@ spec:
469469
- name: NETWORK_POLICY_ENFORCING_MODE
470470
value: "standard"
471471
- name: VPC_CNI_VERSION
472-
value: "v1.18.1"
472+
value: "v1.18.2"
473473
- name: WARM_ENI_TARGET
474474
value: "1"
475475
- name: WARM_PREFIX_TARGET
@@ -504,7 +504,7 @@ spec:
504504
- mountPath: /run/xtables.lock
505505
name: xtables-lock
506506
- name: aws-eks-nodeagent
507-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.1
507+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.2
508508
env:
509509
- name: MY_NODE_NAME
510510
valueFrom:
@@ -516,6 +516,7 @@ spec:
516516
- --enable-network-policy=false
517517
- --enable-cloudwatch-logs=false
518518
- --enable-policy-event-logs=false
519+
- --log-file=/var/log/aws-routed-eni/network-policy-agent.log
519520
- --metrics-bind-addr=:8162
520521
- --health-probe-bind-addr=:8163
521522
- --conntrack-cache-cleanup-period=300
@@ -557,6 +558,7 @@ spec:
557558
- name: xtables-lock
558559
hostPath:
559560
path: /run/xtables.lock
561+
type: FileOrCreate
560562
affinity:
561563
nodeAffinity:
562564
requiredDuringSchedulingIgnoredDuringExecution:

0 commit comments

Comments
 (0)
Please sign in to comment.