Skip to content

Commit dc68ced

Browse files
jaydeokarjaydeokar
authored
Merge branch 'master' into release-1.20
2 parents 63b8b0b + 0ab3fcb commit dc68ced

18 files changed

+66
-45
lines changed

‎CHANGELOG.md‎

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

3+
## v1.20.2
4+
* Bump github.com/samber/lo from 1.49.1 to 1.51.0 by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3386
5+
* Bump github.com/prometheus/client_model from 0.6.1 to 0.6.2 by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3385
6+
* Bump the aws-dependencies group with 11 updates by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3384
7+
* Adding release notes and chart update by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3399
8+
* updating tags by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3400
9+
* Add and configure soak tests workflow by @Supreeth095 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3404
10+
* Add and configure soak tests workflow by @Supreeth095 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3407
11+
* Bump actions/checkout from 4.1.7 to 5.0.0 by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3409
12+
* Bump helm.sh/helm/v3 from 3.18.4 to 3.18.5 by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3401
13+
* Removing pinning of golang version by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3411
14+
* Bump the k8s-dependencies group across 1 directory with 5 updates by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3413
15+
* chore: update VPC IP resource limits by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3419
16+
* chore: update VPC IP resource limits by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3420
17+
* Fetch only necessary plugins by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3416
18+
* chore: update VPC IP resource limits by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3422
19+
* chore: update VPC IP resource limits by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3438
20+
* Move npagent server port to unix socket by @Pavani-Panakanti in https://github.com/aws/amazon-vpc-cni-k8s/pull/3442
21+
322
## v1.20.1
423
* Adding release notes for mult-nic feature by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3350
524
* bumping kops tag by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3355

‎Makefile‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,19 +292,21 @@ docker-metrics-test: ## Run metrics helper unit test suite in a container.
292292
plugins: FETCH_VERSION=1.7.1
293293
plugins: FETCH_URL=https://github.com/containernetworking/plugins/archive/refs/tags/v$(FETCH_VERSION).tar.gz
294294
plugins: VISIT_URL=https://github.com/containernetworking/plugins/tree/v$(FETCH_VERSION)/plugins/
295-
plugins: CORE_PLUGINS=bandwidth,host-local,loopback,portmap,sbr
295+
plugins: CORE_PLUGINS = bandwidth host-local loopback portmap sbr
296296
plugins: ## Fetch the CNI plugins
297297
@echo "Fetching Container networking plugins v$(FETCH_VERSION) from upstream release"
298298
@echo
299299
@echo "Visit upstream project for plugin details:"
300300
@echo "$(VISIT_URL)"
301301
@echo
302-
mkdir -p ${CORE_PLUGIN_DIR} ${CORE_PLUGIN_TMP}
303-
curl -s -L $(FETCH_URL) | tar xzf - -C ${CORE_PLUGIN_TMP}
304-
cd ${CORE_PLUGIN_TMP}/plugins-${FETCH_VERSION} && ./build_linux.sh
305-
cp -a ${CORE_PLUGIN_TMP}/plugins-${FETCH_VERSION}/LICENSE ${CORE_PLUGIN_DIR}
306-
cp -a ${CORE_PLUGIN_TMP}/plugins-${FETCH_VERSION}/bin/{$(CORE_PLUGINS)} ${CORE_PLUGIN_DIR}
307-
rm -rf ${CORE_PLUGIN_TMP}
302+
mkdir -p $(CORE_PLUGIN_DIR) $(CORE_PLUGIN_TMP)
303+
curl -s -L $(FETCH_URL) | tar xzf - -C $(CORE_PLUGIN_TMP)
304+
cd $(CORE_PLUGIN_TMP)/plugins-$(FETCH_VERSION) && ./build_linux.sh
305+
cp -a $(CORE_PLUGIN_TMP)/plugins-$(FETCH_VERSION)/LICENSE $(CORE_PLUGIN_DIR)
306+
for PLUGIN in $(CORE_PLUGINS); do \
307+
cp -a $(CORE_PLUGIN_TMP)/plugins-$(FETCH_VERSION)/bin/$$PLUGIN $(CORE_PLUGIN_DIR); \
308+
done
309+
rm -rf $(CORE_PLUGIN_TMP)
308310

309311
##@ Debug script
310312

‎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.20.1
4-
appVersion: "v1.20.1"
3+
version: 1.20.2
4+
appVersion: "v1.20.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

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

Lines changed: 3 additions & 3 deletions
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.20.1` |
51+
| `image.tag` | Image tag | `v1.20.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.20.1` |
59+
| `init.image.tag` | Image tag | `v1.20.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.2.4` |
72+
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.2.6` |
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` |

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

Lines changed: 4 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.20.1
11+
tag: v1.20.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.2.4
30+
tag: v1.2.6
3131
domain: amazonaws.com
3232
region: us-west-2
3333
endpoint: ecr
@@ -52,7 +52,7 @@ nodeAgent:
5252
resources: {}
5353

5454
image:
55-
tag: v1.20.1
55+
tag: v1.20.2
5656
domain: amazonaws.com
5757
region: us-west-2
5858
endpoint: ecr
@@ -86,7 +86,7 @@ env:
8686
ENABLE_IPv4: "true"
8787
ENABLE_IPv6: "false"
8888
ENABLE_SUBNET_DISCOVERY: "true"
89-
VPC_CNI_VERSION: "v1.20.1"
89+
VPC_CNI_VERSION: "v1.20.2"
9090
NETWORK_POLICY_ENFORCING_MODE: "standard"
9191
ENABLE_IMDS_ONLY_MODE: "false"
9292
ENABLE_MULTI_NIC: "false"

‎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.20.1
4-
appVersion: v1.20.1
3+
version: 1.20.2
4+
appVersion: v1.20.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

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

Lines changed: 1 addition & 1 deletion
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.20.1` |
63+
| `image.tag` | Image tag | `v1.20.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` |

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ spec:
418418
hostNetwork: true
419419
initContainers:
420420
- name: aws-vpc-cni-init
421-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.20.1
421+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.20.2
422422
imagePullPolicy: Always
423423
env:
424424
- name: DISABLE_TCP_EARLY_DEMUX
@@ -440,7 +440,7 @@ spec:
440440
{}
441441
containers:
442442
- name: aws-node
443-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.20.1
443+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.20.2
444444
ports:
445445
- containerPort: 61678
446446
name: metrics
@@ -508,7 +508,7 @@ spec:
508508
- name: NETWORK_POLICY_ENFORCING_MODE
509509
value: "standard"
510510
- name: VPC_CNI_VERSION
511-
value: "v1.20.1"
511+
value: "v1.20.2"
512512
- name: WARM_ENI_TARGET
513513
value: "1"
514514
- name: WARM_PREFIX_TARGET
@@ -543,7 +543,7 @@ spec:
543543
- mountPath: /run/xtables.lock
544544
name: xtables-lock
545545
- name: aws-eks-nodeagent
546-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.2.4
546+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.2.6
547547
imagePullPolicy: Always
548548
ports:
549549
- containerPort: 8162

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ spec:
418418
hostNetwork: true
419419
initContainers:
420420
- name: aws-vpc-cni-init
421-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.20.1
421+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.20.2
422422
imagePullPolicy: Always
423423
env:
424424
- name: DISABLE_TCP_EARLY_DEMUX
@@ -440,7 +440,7 @@ spec:
440440
{}
441441
containers:
442442
- name: aws-node
443-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.20.1
443+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.20.2
444444
ports:
445445
- containerPort: 61678
446446
name: metrics
@@ -508,7 +508,7 @@ spec:
508508
- name: NETWORK_POLICY_ENFORCING_MODE
509509
value: "standard"
510510
- name: VPC_CNI_VERSION
511-
value: "v1.20.1"
511+
value: "v1.20.2"
512512
- name: WARM_ENI_TARGET
513513
value: "1"
514514
- name: WARM_PREFIX_TARGET
@@ -543,7 +543,7 @@ spec:
543543
- mountPath: /run/xtables.lock
544544
name: xtables-lock
545545
- name: aws-eks-nodeagent
546-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.2.4
546+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.2.6
547547
imagePullPolicy: Always
548548
ports:
549549
- containerPort: 8162

0 commit comments

Comments
 (0)