Skip to content

Commit e082bae

Browse files
jaydeokarjaydeokar
authored
Merge pull request #3552 from aws/master
Master to release-1.21 sync
2 parents b58ebdb + cdfc4c5 commit e082bae

18 files changed

+88
-74
lines changed

‎CHANGELOG.md‎

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

3+
## v1.21.1
4+
5+
* Bug fix for Network Policy Agent
6+
37
## v1.21.0
48

59
* chore: update VPC IP resource limits by @github-actions[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3521

‎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.21.0
4-
appVersion: "v1.21.0"
3+
version: 1.21.1
4+
appVersion: "v1.21.1"
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,7 +48,7 @@ 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.21.0` |
51+
| `image.tag` | Image tag | `v1.21.1` |
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` |
@@ -57,7 +57,7 @@ The following table lists the configurable parameters for this chart and their d
5757
| `image.overrideRepository` | Repository override for the image (does not change the tag) | `nil` |
5858
| `image.override` | A custom docker image to use | `nil` |
5959
| `imagePullSecrets` | Docker registry pull secret | `[]` |
60-
| `init.image.tag` | Image tag | `v1.21.0` |
60+
| `init.image.tag` | Image tag | `v1.21.1` |
6161
| `init.image.domain` | ECR repository domain | `amazonaws.com` |
6262
| `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
6363
| `init.image.endpoint` | ECR repository endpoint to use. | `ecr` |
@@ -71,7 +71,7 @@ The following table lists the configurable parameters for this chart and their d
7171
| `originalMatchLabels` | Use the original daemonset matchLabels | `false` |
7272
| `nameOverride` | Override the name of the chart | `aws-node` |
7373
| `nodeAgent.enabled` | If the Node Agent container should be created | `true` |
74-
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.3.0` |
74+
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.3.1` |
7575
| `nodeAgent.image.domain`| ECR repository domain | `amazonaws.com` |
7676
| `nodeAgent.image.region`| ECR repository region to use. Should match your cluster | `us-west-2` |
7777
| `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ rules:
3636
- apiGroups: ["networking.k8s.aws"]
3737
resources:
3838
- policyendpoints
39+
- clusterpolicyendpoints
3940
verbs: ["get", "list", "watch"]
4041
- apiGroups: ["networking.k8s.aws"]
4142
resources:
4243
- policyendpoints/status
44+
- clusterpolicyendpoints/status
4345
verbs: ["get"]
4446
- apiGroups:
4547
- vpcresources.k8s.aws

‎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.21.0
11+
tag: v1.21.1
1212
domain: amazonaws.com
1313
region: us-west-2
1414
endpoint: ecr
@@ -29,7 +29,7 @@ init:
2929
nodeAgent:
3030
enabled: true
3131
image:
32-
tag: v1.3.0
32+
tag: v1.3.1
3333
domain: amazonaws.com
3434
region: us-west-2
3535
endpoint: ecr
@@ -56,7 +56,7 @@ nodeAgent:
5656
resources: {}
5757

5858
image:
59-
tag: v1.21.0
59+
tag: v1.21.1
6060
domain: amazonaws.com
6161
region: us-west-2
6262
endpoint: ecr
@@ -92,7 +92,7 @@ env:
9292
ENABLE_IPv4: "true"
9393
ENABLE_IPv6: "false"
9494
ENABLE_SUBNET_DISCOVERY: "true"
95-
VPC_CNI_VERSION: "v1.21.0"
95+
VPC_CNI_VERSION: "v1.21.1"
9696
NETWORK_POLICY_ENFORCING_MODE: "standard"
9797
ENABLE_IMDS_ONLY_MODE: "false"
9898
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.21.0
4-
appVersion: v1.21.0
3+
version: 1.21.1
4+
appVersion: v1.21.1
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.21.0` |
63+
| `image.tag` | Image tag | `v1.21.1` |
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.21.0
7+
tag: v1.21.1
88
account: "602401143452"
99
domain: "amazonaws.com"
1010
# Set to use custom image

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ metadata:
315315
app.kubernetes.io/name: aws-node
316316
app.kubernetes.io/instance: aws-vpc-cni
317317
k8s-app: aws-node
318-
app.kubernetes.io/version: "v1.21.0"
318+
app.kubernetes.io/version: "v1.21.1"
319319
---
320320
# Source: aws-vpc-cni/templates/configmap.yaml
321321
apiVersion: v1
@@ -327,7 +327,7 @@ metadata:
327327
app.kubernetes.io/name: aws-node
328328
app.kubernetes.io/instance: aws-vpc-cni
329329
k8s-app: aws-node
330-
app.kubernetes.io/version: "v1.21.0"
330+
app.kubernetes.io/version: "v1.21.1"
331331
data:
332332
enable-windows-ipam: "false"
333333
enable-network-policy-controller: "false"
@@ -346,7 +346,7 @@ metadata:
346346
app.kubernetes.io/name: aws-node
347347
app.kubernetes.io/instance: aws-vpc-cni
348348
k8s-app: aws-node
349-
app.kubernetes.io/version: "v1.21.0"
349+
app.kubernetes.io/version: "v1.21.1"
350350
rules:
351351
- apiGroups:
352352
- crd.k8s.amazonaws.com
@@ -372,10 +372,12 @@ rules:
372372
- apiGroups: ["networking.k8s.aws"]
373373
resources:
374374
- policyendpoints
375+
- clusterpolicyendpoints
375376
verbs: ["get", "list", "watch"]
376377
- apiGroups: ["networking.k8s.aws"]
377378
resources:
378379
- policyendpoints/status
380+
- clusterpolicyendpoints/status
379381
verbs: ["get"]
380382
- apiGroups:
381383
- vpcresources.k8s.aws
@@ -394,7 +396,7 @@ metadata:
394396
app.kubernetes.io/name: aws-node
395397
app.kubernetes.io/instance: aws-vpc-cni
396398
k8s-app: aws-node
397-
app.kubernetes.io/version: "v1.21.0"
399+
app.kubernetes.io/version: "v1.21.1"
398400
roleRef:
399401
apiGroup: rbac.authorization.k8s.io
400402
kind: ClusterRole
@@ -414,7 +416,7 @@ metadata:
414416
app.kubernetes.io/name: aws-node
415417
app.kubernetes.io/instance: aws-vpc-cni
416418
k8s-app: aws-node
417-
app.kubernetes.io/version: "v1.21.0"
419+
app.kubernetes.io/version: "v1.21.1"
418420
spec:
419421
updateStrategy:
420422
rollingUpdate:
@@ -435,7 +437,7 @@ spec:
435437
hostNetwork: true
436438
initContainers:
437439
- name: aws-vpc-cni-init
438-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.21.0
440+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.21.1
439441
imagePullPolicy: Always
440442
env:
441443
- name: DISABLE_TCP_EARLY_DEMUX
@@ -457,7 +459,7 @@ spec:
457459
{}
458460
containers:
459461
- name: aws-node
460-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.21.0
462+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.21.1
461463
ports:
462464
- containerPort: 61678
463465
name: metrics
@@ -525,7 +527,7 @@ spec:
525527
- name: NETWORK_POLICY_ENFORCING_MODE
526528
value: "standard"
527529
- name: VPC_CNI_VERSION
528-
value: "v1.21.0"
530+
value: "v1.21.1"
529531
- name: WARM_ENI_TARGET
530532
value: "1"
531533
- name: WARM_PREFIX_TARGET
@@ -560,7 +562,7 @@ spec:
560562
- mountPath: /run/xtables.lock
561563
name: xtables-lock
562564
- name: aws-eks-nodeagent
563-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.3.0
565+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.3.1
564566
imagePullPolicy: Always
565567
ports:
566568
- containerPort: 8162

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ metadata:
315315
app.kubernetes.io/name: aws-node
316316
app.kubernetes.io/instance: aws-vpc-cni
317317
k8s-app: aws-node
318-
app.kubernetes.io/version: "v1.21.0"
318+
app.kubernetes.io/version: "v1.21.1"
319319
---
320320
# Source: aws-vpc-cni/templates/configmap.yaml
321321
apiVersion: v1
@@ -327,7 +327,7 @@ metadata:
327327
app.kubernetes.io/name: aws-node
328328
app.kubernetes.io/instance: aws-vpc-cni
329329
k8s-app: aws-node
330-
app.kubernetes.io/version: "v1.21.0"
330+
app.kubernetes.io/version: "v1.21.1"
331331
data:
332332
enable-windows-ipam: "false"
333333
enable-network-policy-controller: "false"
@@ -346,7 +346,7 @@ metadata:
346346
app.kubernetes.io/name: aws-node
347347
app.kubernetes.io/instance: aws-vpc-cni
348348
k8s-app: aws-node
349-
app.kubernetes.io/version: "v1.21.0"
349+
app.kubernetes.io/version: "v1.21.1"
350350
rules:
351351
- apiGroups:
352352
- crd.k8s.amazonaws.com
@@ -372,10 +372,12 @@ rules:
372372
- apiGroups: ["networking.k8s.aws"]
373373
resources:
374374
- policyendpoints
375+
- clusterpolicyendpoints
375376
verbs: ["get", "list", "watch"]
376377
- apiGroups: ["networking.k8s.aws"]
377378
resources:
378379
- policyendpoints/status
380+
- clusterpolicyendpoints/status
379381
verbs: ["get"]
380382
- apiGroups:
381383
- vpcresources.k8s.aws
@@ -394,7 +396,7 @@ metadata:
394396
app.kubernetes.io/name: aws-node
395397
app.kubernetes.io/instance: aws-vpc-cni
396398
k8s-app: aws-node
397-
app.kubernetes.io/version: "v1.21.0"
399+
app.kubernetes.io/version: "v1.21.1"
398400
roleRef:
399401
apiGroup: rbac.authorization.k8s.io
400402
kind: ClusterRole
@@ -414,7 +416,7 @@ metadata:
414416
app.kubernetes.io/name: aws-node
415417
app.kubernetes.io/instance: aws-vpc-cni
416418
k8s-app: aws-node
417-
app.kubernetes.io/version: "v1.21.0"
419+
app.kubernetes.io/version: "v1.21.1"
418420
spec:
419421
updateStrategy:
420422
rollingUpdate:
@@ -435,7 +437,7 @@ spec:
435437
hostNetwork: true
436438
initContainers:
437439
- name: aws-vpc-cni-init
438-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.21.0
440+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.21.1
439441
imagePullPolicy: Always
440442
env:
441443
- name: DISABLE_TCP_EARLY_DEMUX
@@ -457,7 +459,7 @@ spec:
457459
{}
458460
containers:
459461
- name: aws-node
460-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.21.0
462+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.21.1
461463
ports:
462464
- containerPort: 61678
463465
name: metrics
@@ -525,7 +527,7 @@ spec:
525527
- name: NETWORK_POLICY_ENFORCING_MODE
526528
value: "standard"
527529
- name: VPC_CNI_VERSION
528-
value: "v1.21.0"
530+
value: "v1.21.1"
529531
- name: WARM_ENI_TARGET
530532
value: "1"
531533
- name: WARM_PREFIX_TARGET
@@ -560,7 +562,7 @@ spec:
560562
- mountPath: /run/xtables.lock
561563
name: xtables-lock
562564
- name: aws-eks-nodeagent
563-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.3.0
565+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.3.1
564566
imagePullPolicy: Always
565567
ports:
566568
- containerPort: 8162

0 commit comments

Comments
 (0)