Skip to content

Commit d3dbfc9

Browse files
author
Jeffrey Nelson
authored
Update CHANGELOG, charts, and manifests for v1.15.5 release (#2712)
1 parent 3c6154e commit d3dbfc9

19 files changed

+84
-69
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## v1.15.5
4+
5+
* Bug - [Add watch permission for CNINode resource](https://github.com/aws/amazon-vpc-cni-k8s/pull/2681) (@jdn5126 )
6+
* Improvement - [Upgrade go from 1.21.4 to 1.21.5](https://github.com/aws/amazon-vpc-cni-k8s/pull/2707) (@jchen6585 )
7+
* Improvement - [Dependabot Golang updates, test agent fix](https://github.com/aws/amazon-vpc-cni-k8s/pull/2698) (@jdn5126 )
8+
* Improvement - [Bump aws-sdk-go to v1.48.2](https://github.com/aws/amazon-vpc-cni-k8s/pull/2674) (@jchen6585 )
9+
310
## v1.15.4
411

512
* Documentation - [Update prefix-and-ip-target.md](https://github.com/aws/amazon-vpc-cni-k8s/pull/2658) (@nicolajknudsen )

‎charts/aws-vpc-cni/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: aws-vpc-cni
3-
version: 1.15.4
4-
appVersion: "v1.15.4"
3+
version: 1.15.5
4+
appVersion: "v1.15.5"
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

‎charts/aws-vpc-cni/README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ The following table lists the configurable parameters for this chart and their d
4343
| `enableWindowsIpam` | Enable windows support for your cluster | `false` |
4444
| `enableNetworkPolicy` | Enable Network Policy Controller and Agent for your cluster | `false` |
4545
| `fullnameOverride` | Override the fullname of the chart | `aws-node` |
46-
| `image.tag` | Image tag | `v1.15.4` |
46+
| `image.tag` | Image tag | `v1.15.5` |
4747
| `image.domain` | ECR repository domain | `amazonaws.com` |
4848
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
4949
| `image.endpoint` | ECR repository endpoint to use. | `ecr` |
5050
| `image.account` | ECR repository account number | `602401143452` |
5151
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
5252
| `image.override` | A custom docker image to use | `nil` |
5353
| `imagePullSecrets` | Docker registry pull secret | `[]` |
54-
| `init.image.tag` | Image tag | `v1.15.4` |
54+
| `init.image.tag` | Image tag | `v1.15.5` |
5555
| `init.image.domain` | ECR repository domain | `amazonaws.com` |
5656
| `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
5757
| `init.image.endpoint` | ECR repository endpoint to use. | `ecr` |
@@ -64,7 +64,7 @@ The following table lists the configurable parameters for this chart and their d
6464
| `originalMatchLabels` | Use the original daemonset matchLabels | `false` |
6565
| `nameOverride` | Override the name of the chart | `aws-node` |
6666
| `nodeAgent.enabled` | If the Node Agent container should be created | `true` |
67-
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.0.6` |
67+
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.0.7` |
6868
| `nodeAgent.image.domain`| ECR repository domain | `amazonaws.com` |
6969
| `nodeAgent.image.region`| ECR repository region to use. Should match your cluster | `us-west-2` |
7070
| `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` |
@@ -75,6 +75,7 @@ The following table lists the configurable parameters for this chart and their d
7575
| `nodeAgent.enablePolicyEventLogs` | Enable policy decision logs for Node Agent | `false` |
7676
| `nodeAgent.metricsBindAddr` | Node Agent port for metrics | `8162` |
7777
| `nodeAgent.healthProbeBindAddr` | Node Agent port for health probes | `8163` |
78+
| `nodeAgent.conntrackCacheCleanupPeriod` | Cleanup interval for network policy agent conntrack cache | 300 |
7879
| `nodeAgent.enableIpv6` | Enable IPv6 support for Node Agent | `false` |
7980
| `nodeAgent.resources` | Node Agent resources, will defualt to .Values.resources if not set | `{}` |
8081
| `extraVolumes` | Array to add extra volumes | `[]` |

‎charts/aws-vpc-cni/templates/daemonset.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ spec:
136136
- --enable-policy-event-logs={{ .Values.nodeAgent.enablePolicyEventLogs }}
137137
- --metrics-bind-addr={{ include "aws-vpc-cni.nodeAgentMetricsBindAddr" . }}
138138
- --health-probe-bind-addr={{ include "aws-vpc-cni.nodeAgentHealthProbeBindAddr" . }}
139+
- --conntrack-cache-cleanup-period={{ .Values.nodeAgent.conntrackCacheCleanupPeriod }}
139140
{{- with default .Values.resources .Values.nodeAgent.resources }}
140141
resources:
141142
{{- toYaml . | nindent 12 }}

‎charts/aws-vpc-cni/test.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ nameOverride: aws-node
66

77
init:
88
image:
9-
tag: v1.15.4
9+
tag: v1.15.5
1010
region: us-west-2
1111
pullPolicy: Always
1212
# Set to use custom image
@@ -19,7 +19,7 @@ init:
1919
nodeAgent:
2020
enabled: true
2121
image:
22-
tag: v1.0.6
22+
tag: v1.0.7
2323
region: us-west-2
2424
pullPolicy: Always
2525
# Set to use custom image
@@ -32,10 +32,11 @@ nodeAgent:
3232
enableCloudWatchLogs: "false"
3333
enablePolicyEventLogs: "false"
3434
enableIpv6: "false"
35+
conntrackCacheCleanupPeriod: 300
3536

3637
image:
3738
region: us-west-2
38-
tag: v1.15.4
39+
tag: v1.15.5
3940
pullPolicy: Always
4041
# Set to use custom image
4142
# override: "repo/org/image:tag"

‎charts/aws-vpc-cni/values.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nameOverride: aws-node
88

99
init:
1010
image:
11-
tag: v1.15.4
11+
tag: v1.15.5
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.0.6
30+
tag: v1.0.7
3131
domain: amazonaws.com
3232
region: us-west-2
3333
endpoint: ecr
@@ -46,10 +46,11 @@ nodeAgent:
4646
enableIpv6: "false"
4747
metricsBindAddr: "8162"
4848
healthProbeBindAddr: "8163"
49+
conntrackCacheCleanupPeriod: 300
4950
resources: {}
5051

5152
image:
52-
tag: v1.15.4
53+
tag: v1.15.5
5354
domain: amazonaws.com
5455
region: us-west-2
5556
endpoint: ecr
@@ -82,7 +83,7 @@ env:
8283
DISABLE_NETWORK_RESOURCE_PROVISIONING: "false"
8384
ENABLE_IPv4: "true"
8485
ENABLE_IPv6: "false"
85-
VPC_CNI_VERSION: "v1.15.4"
86+
VPC_CNI_VERSION: "v1.15.5"
8687

8788
# this flag enables you to use the match label that was present in the original daemonset deployed by EKS
8889
# You can then annotate and label the original aws-node resources and 'adopt' them into a helm release

‎charts/cni-metrics-helper/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: cni-metrics-helper
3-
version: 1.15.4
4-
appVersion: v1.15.4
3+
version: 1.15.5
4+
appVersion: v1.15.5
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

‎charts/cni-metrics-helper/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The following table lists the configurable parameters for this chart and their d
4747
|------------------------------|---------------------------------------------------------------|--------------------|
4848
| fullnameOverride | Override the fullname of the chart | cni-metrics-helper |
4949
| image.region | ECR repository region to use. Should match your cluster | us-west-2 |
50-
| image.tag | Image tag | v1.15.4 |
50+
| image.tag | Image tag | v1.15.5 |
5151
| image.account | ECR repository account number | 602401143452 |
5252
| image.domain | ECR repository domain | amazonaws.com |
5353
| env.USE_CLOUDWATCH | Whether to export CNI metrics to CloudWatch | true |

‎charts/cni-metrics-helper/values.yaml‎

Lines changed: 1 addition & 1 deletion
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.15.4
7+
tag: v1.15.5
88
account: "602401143452"
99
domain: "amazonaws.com"
1010
# Set to use custom image

‎config/master/aws-k8s-cni-cn.yaml‎

Lines changed: 10 additions & 9 deletions
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.15.4"
269+
app.kubernetes.io/version: "v1.15.5"
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.15.4"
281+
app.kubernetes.io/version: "v1.15.5"
282282
data:
283283
enable-windows-ipam: "false"
284284
enable-network-policy-controller: "false"
@@ -292,7 +292,7 @@ metadata:
292292
app.kubernetes.io/name: aws-node
293293
app.kubernetes.io/instance: aws-vpc-cni
294294
k8s-app: aws-node
295-
app.kubernetes.io/version: "v1.15.4"
295+
app.kubernetes.io/version: "v1.15.5"
296296
rules:
297297
- apiGroups:
298298
- crd.k8s.amazonaws.com
@@ -338,7 +338,7 @@ metadata:
338338
app.kubernetes.io/name: aws-node
339339
app.kubernetes.io/instance: aws-vpc-cni
340340
k8s-app: aws-node
341-
app.kubernetes.io/version: "v1.15.4"
341+
app.kubernetes.io/version: "v1.15.5"
342342
roleRef:
343343
apiGroup: rbac.authorization.k8s.io
344344
kind: ClusterRole
@@ -358,7 +358,7 @@ metadata:
358358
app.kubernetes.io/name: aws-node
359359
app.kubernetes.io/instance: aws-vpc-cni
360360
k8s-app: aws-node
361-
app.kubernetes.io/version: "v1.15.4"
361+
app.kubernetes.io/version: "v1.15.5"
362362
spec:
363363
updateStrategy:
364364
rollingUpdate:
@@ -379,7 +379,7 @@ spec:
379379
hostNetwork: true
380380
initContainers:
381381
- name: aws-vpc-cni-init
382-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.15.4
382+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.15.5
383383
env:
384384
- name: DISABLE_TCP_EARLY_DEMUX
385385
value: "false"
@@ -400,7 +400,7 @@ spec:
400400
{}
401401
containers:
402402
- name: aws-node
403-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.15.4
403+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.15.5
404404
ports:
405405
- containerPort: 61678
406406
name: metrics
@@ -460,7 +460,7 @@ spec:
460460
- name: ENABLE_PREFIX_DELEGATION
461461
value: "false"
462462
- name: VPC_CNI_VERSION
463-
value: "v1.15.4"
463+
value: "v1.15.5"
464464
- name: WARM_ENI_TARGET
465465
value: "1"
466466
- name: WARM_PREFIX_TARGET
@@ -495,7 +495,7 @@ spec:
495495
- mountPath: /run/xtables.lock
496496
name: xtables-lock
497497
- name: aws-eks-nodeagent
498-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.0.6
498+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.0.7
499499
env:
500500
- name: MY_NODE_NAME
501501
valueFrom:
@@ -509,6 +509,7 @@ spec:
509509
- --enable-policy-event-logs=false
510510
- --metrics-bind-addr=:8162
511511
- --health-probe-bind-addr=:8163
512+
- --conntrack-cache-cleanup-period=300
512513
resources:
513514
requests:
514515
cpu: 25m

0 commit comments

Comments
 (0)