Skip to content

Commit 7b4d6c0

Browse files
jdn5126Joseph Chen
jdn5126
authored and
Joseph Chen
committed
Update CHANGELOG, charts, and manifests for v1.15.5 release; update aws-vpc-cni ConfigMap default settings (aws#2716)
* update CHANGELOG, charts, and manifests for v1.15.5 release * windows prefix delegation settings
1 parent 7be99f2 commit 7b4d6c0

20 files changed

+117
-248
lines changed

‎CHANGELOG.md

+7
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

+2-2
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

+9-3
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,21 @@ The following table lists the configurable parameters for this chart and their d
4242
| `env` | List of environment variables. See [here](https://github.com/aws/amazon-vpc-cni-k8s#cni-configuration-variables) for options | (see `values.yaml`) |
4343
| `enableWindowsIpam` | Enable windows support for your cluster | `false` |
4444
| `enableNetworkPolicy` | Enable Network Policy Controller and Agent for your cluster | `false` |
45+
| `enableWindowsPrefixDelegation` | Enable windows prefix delegation support for your cluster | `false` |
46+
| `warmWindowsPrefixTarget` | Warm prefix target value for Windows prefix delegation | `0` |
47+
| `warmWindowsIPTarget` | Warm IP target value for Windows prefix delegation | `1` |
48+
| `minimumWindowsIPTarget`| Minimum IP target value for Windows prefix delegation | `3` |
49+
| `branchENICooldown` | Number of seconds that branch ENIs remain in cooldown | `60` |
4550
| `fullnameOverride` | Override the fullname of the chart | `aws-node` |
46-
| `image.tag` | Image tag | `v1.15.4` |
51+
| `image.tag` | Image tag | `v1.15.5` |
4752
| `image.domain` | ECR repository domain | `amazonaws.com` |
4853
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
4954
| `image.endpoint` | ECR repository endpoint to use. | `ecr` |
5055
| `image.account` | ECR repository account number | `602401143452` |
5156
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
5257
| `image.override` | A custom docker image to use | `nil` |
5358
| `imagePullSecrets` | Docker registry pull secret | `[]` |
54-
| `init.image.tag` | Image tag | `v1.15.4` |
59+
| `init.image.tag` | Image tag | `v1.15.5` |
5560
| `init.image.domain` | ECR repository domain | `amazonaws.com` |
5661
| `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
5762
| `init.image.endpoint` | ECR repository endpoint to use. | `ecr` |
@@ -64,7 +69,7 @@ The following table lists the configurable parameters for this chart and their d
6469
| `originalMatchLabels` | Use the original daemonset matchLabels | `false` |
6570
| `nameOverride` | Override the name of the chart | `aws-node` |
6671
| `nodeAgent.enabled` | If the Node Agent container should be created | `true` |
67-
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.0.6` |
72+
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.0.7` |
6873
| `nodeAgent.image.domain`| ECR repository domain | `amazonaws.com` |
6974
| `nodeAgent.image.region`| ECR repository region to use. Should match your cluster | `us-west-2` |
7075
| `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` |
@@ -75,6 +80,7 @@ The following table lists the configurable parameters for this chart and their d
7580
| `nodeAgent.enablePolicyEventLogs` | Enable policy decision logs for Node Agent | `false` |
7681
| `nodeAgent.metricsBindAddr` | Node Agent port for metrics | `8162` |
7782
| `nodeAgent.healthProbeBindAddr` | Node Agent port for health probes | `8163` |
83+
| `nodeAgent.conntrackCacheCleanupPeriod` | Cleanup interval for network policy agent conntrack cache | 300 |
7884
| `nodeAgent.enableIpv6` | Enable IPv6 support for Node Agent | `false` |
7985
| `nodeAgent.resources` | Node Agent resources, will defualt to .Values.resources if not set | `{}` |
8086
| `extraVolumes` | Array to add extra volumes | `[]` |

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

+1
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

-175
This file was deleted.

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

+15-9
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,19 +83,24 @@ 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
8990
originalMatchLabels: false
9091

91-
enableWindowsIpam: "false"
92+
# Settings for aws-vpc-cni ConfigMap
93+
# - Network Policy settings
9294
enableNetworkPolicy: "false"
95+
# - Windows settings
96+
enableWindowsIpam: "false"
97+
# - Windows Prefix Delegation settings
9398
enableWindowsPrefixDelegation: "false"
94-
warmWindowsPrefixTarget: "0"
95-
warmWindowsIPTarget: "0"
96-
minimumWindowsIPTarget: "0"
97-
branchENICooldown: "60"
99+
warmWindowsPrefixTarget: 0
100+
warmWindowsIPTarget: 1
101+
minimumWindowsIPTarget: 3
102+
# - Security Groups for Pods settings
103+
branchENICooldown: 60
98104

99105
cniConfig:
100106
enabled: false

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

+2-2
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

+1-1
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

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

0 commit comments

Comments
 (0)