Skip to content

Commit b58ebdb

Browse files
jaydeokarjaydeokar
authored
Merge branch 'master' into release-1.21
2 parents 06343ad + f3a6226 commit b58ebdb

19 files changed

+367
-268
lines changed

‎CHANGELOG.md‎

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

3+
## v1.21.0
4+
5+
* chore: update VPC IP resource limits by @github-actions[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3521
6+
* Bump peter-evans/create-pull-request from 7.0.5 to 7.0.9 by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3519
7+
* Bump golang.org/x/crypto from 0.40.0 to 0.45.0 by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3515
8+
* Merge into release branch by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3522
9+
* updating changelog by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3525
10+
* chore: update VPC IP resource limits by @github-actions[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3532
11+
* updating setup go fo gh action by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3537
12+
* update tags by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3535
13+
* update golang version by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3536
14+
315
## v1.20.5
416

517
* enabling pod egress traffic test for under mac address policy variation by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3459

‎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.5
4-
appVersion: "v1.20.5"
3+
version: 1.21.0
4+
appVersion: "v1.21.0"
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.20.5` |
51+
| `image.tag` | Image tag | `v1.21.0` |
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.20.5` |
60+
| `init.image.tag` | Image tag | `v1.21.0` |
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.2.7` |
74+
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.3.0` |
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/crds/customresourcedefinition.yaml‎

Lines changed: 55 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,19 @@ spec:
7676
description: PolicyEndpoint is the Schema for the policyendpoints API
7777
properties:
7878
apiVersion:
79-
description: 'APIVersion defines the versioned schema of this representation
80-
of an object. Servers should convert recognized schemas to the latest
81-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
79+
description: |-
80+
APIVersion defines the versioned schema of this representation of an object.
81+
Servers should convert recognized schemas to the latest internal value, and
82+
may reject unrecognized values.
83+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
8284
type: string
8385
kind:
84-
description: 'Kind is a string value representing the REST resource this
85-
object represents. Servers may infer this from the endpoint the client
86-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
86+
description: |-
87+
Kind is a string value representing the REST resource this object represents.
88+
Servers may infer this from the endpoint the client submits requests to.
89+
Cannot be updated.
90+
In CamelCase.
91+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
8792
type: string
8893
metadata:
8994
type: object
@@ -100,6 +105,12 @@ spec:
100105
cidr:
101106
description: CIDR is the network address(s) of the endpoint
102107
type: string
108+
domainName:
109+
description: |-
110+
DomainName is the FQDN for the endpoint (mutually exclusive with CIDR, egress-only)
111+
Note: This field should only be used in egress rules, not ingress
112+
pattern: ^(\*\.)?([a-zA-z0-9]([-a-zA-Z0-9_]*[a-zA-Z0-9])?\.)+[a-zA-z0-9]([-a-zA-Z0-9_]*[a-zA-Z0-9])?\.?$
113+
type: string
103114
except:
104115
description: Except is the exceptions to the CIDR ranges mentioned
105116
above.
@@ -113,9 +124,9 @@ spec:
113124
port/protocol
114125
properties:
115126
endPort:
116-
description: Endport specifies the port range port to
117-
endPort port must be defined and an integer, endPort
118-
> port
127+
description: |-
128+
Endport specifies the port range port to endPort
129+
port must be defined and an integer, endPort > port
119130
format: int32
120131
type: integer
121132
port:
@@ -130,8 +141,6 @@ spec:
130141
type: string
131142
type: object
132143
type: array
133-
required:
134-
- cidr
135144
type: object
136145
type: array
137146
ingress:
@@ -144,6 +153,12 @@ spec:
144153
cidr:
145154
description: CIDR is the network address(s) of the endpoint
146155
type: string
156+
domainName:
157+
description: |-
158+
DomainName is the FQDN for the endpoint (mutually exclusive with CIDR, egress-only)
159+
Note: This field should only be used in egress rules, not ingress
160+
pattern: ^(\*\.)?([a-zA-z0-9]([-a-zA-Z0-9_]*[a-zA-Z0-9])?\.)+[a-zA-z0-9]([-a-zA-Z0-9_]*[a-zA-Z0-9])?\.?$
161+
type: string
147162
except:
148163
description: Except is the exceptions to the CIDR ranges mentioned
149164
above.
@@ -157,9 +172,9 @@ spec:
157172
port/protocol
158173
properties:
159174
endPort:
160-
description: Endport specifies the port range port to
161-
endPort port must be defined and an integer, endPort
162-
> port
175+
description: |-
176+
Endport specifies the port range port to endPort
177+
port must be defined and an integer, endPort > port
163178
format: int32
164179
type: integer
165180
port:
@@ -174,18 +189,17 @@ spec:
174189
type: string
175190
type: object
176191
type: array
177-
required:
178-
- cidr
179192
type: object
180193
type: array
181194
podIsolation:
182-
description: PodIsolation specifies whether the pod needs to be isolated
183-
for a particular traffic direction Ingress or Egress, or both. If
184-
default isolation is not specified, and there are no ingress/egress
185-
rules, then the pod is not isolated from the point of view of this
186-
policy. This follows the NetworkPolicy spec.PolicyTypes.
195+
description: |-
196+
PodIsolation specifies whether the pod needs to be isolated for a
197+
particular traffic direction Ingress or Egress, or both. If default isolation is not
198+
specified, and there are no ingress/egress rules, then the pod is not isolated
199+
from the point of view of this policy. This follows the NetworkPolicy spec.PolicyTypes.
187200
items:
188-
description: PolicyType string describes the NetworkPolicy type
201+
description: |-
202+
PolicyType string describes the NetworkPolicy type
189203
This type is beta-level in 1.8
190204
type: string
191205
type: array
@@ -196,46 +210,48 @@ spec:
196210
description: matchExpressions is a list of label selector requirements.
197211
The requirements are ANDed.
198212
items:
199-
description: A label selector requirement is a selector that
200-
contains values, a key, and an operator that relates the key
201-
and values.
213+
description: |-
214+
A label selector requirement is a selector that contains values, a key, and an operator that
215+
relates the key and values.
202216
properties:
203217
key:
204218
description: key is the label key that the selector applies
205219
to.
206220
type: string
207221
operator:
208-
description: operator represents a key's relationship to
209-
a set of values. Valid operators are In, NotIn, Exists
210-
and DoesNotExist.
222+
description: |-
223+
operator represents a key's relationship to a set of values.
224+
Valid operators are In, NotIn, Exists and DoesNotExist.
211225
type: string
212226
values:
213-
description: values is an array of string values. If the
214-
operator is In or NotIn, the values array must be non-empty.
215-
If the operator is Exists or DoesNotExist, the values
216-
array must be empty. This array is replaced during a strategic
227+
description: |-
228+
values is an array of string values. If the operator is In or NotIn,
229+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
230+
the values array must be empty. This array is replaced during a strategic
217231
merge patch.
218232
items:
219233
type: string
220234
type: array
235+
x-kubernetes-list-type: atomic
221236
required:
222237
- key
223238
- operator
224239
type: object
225240
type: array
241+
x-kubernetes-list-type: atomic
226242
matchLabels:
227243
additionalProperties:
228244
type: string
229-
description: matchLabels is a map of {key,value} pairs. A single
230-
{key,value} in the matchLabels map is equivalent to an element
231-
of matchExpressions, whose key field is "key", the operator
232-
is "In", and the values array contains only "value". The requirements
233-
are ANDed.
245+
description: |-
246+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
247+
map is equivalent to an element of matchExpressions, whose key field is "key", the
248+
operator is "In", and the values array contains only "value". The requirements are ANDed.
234249
type: object
235250
type: object
236251
x-kubernetes-map-type: atomic
237252
podSelectorEndpoints:
238-
description: PodSelectorEndpoints contains information about the pods
253+
description: |-
254+
PodSelectorEndpoints contains information about the pods
239255
matching the podSelector
240256
items:
241257
description: PodEndpoint defines the summary information for the
@@ -285,4 +301,4 @@ spec:
285301
served: true
286302
storage: true
287303
subresources:
288-
status: {}
304+
status: {}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,5 @@ rules:
4646
resources:
4747
- cninodes
4848
verbs: ["get", "list", "watch", "patch"]
49+
- nonResourceURLs: ["/apis/networking.k8s.aws", "/apis/networking.k8s.aws/*"]
50+
verbs: ["get"]

‎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.5
11+
tag: v1.21.0
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.2.7
32+
tag: v1.3.0
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.20.5
59+
tag: v1.21.0
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.20.5"
95+
VPC_CNI_VERSION: "v1.21.0"
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.20.5
4-
appVersion: v1.20.5
3+
version: 1.21.0
4+
appVersion: v1.21.0
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.5` |
63+
| `image.tag` | Image tag | `v1.21.0` |
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.5
7+
tag: v1.21.0
88
account: "602401143452"
99
domain: "amazonaws.com"
1010
# Set to use custom image

0 commit comments

Comments
 (0)