Skip to content

Commit b918c36

Browse files
damdodamdo
authored
bump to capi v1.7.0 (#4897)
- bump deps for capi v1.7.x - enable MachinePools by default - use capi v1.7.0
1 parent a3368c7 commit b918c36

29 files changed

+4419
-4218
lines changed

‎config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigs.yaml

Lines changed: 95 additions & 83 deletions
Large diffs are not rendered by default.

‎config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigtemplates.yaml

Lines changed: 57 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: eksconfigtemplates.bootstrap.cluster.x-k8s.io
88
spec:
99
group: bootstrap.cluster.x-k8s.io
@@ -25,14 +25,19 @@ spec:
2525
API.
2626
properties:
2727
apiVersion:
28-
description: 'APIVersion defines the versioned schema of this representation
29-
of an object. Servers should convert recognized schemas to the latest
30-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
28+
description: |-
29+
APIVersion defines the versioned schema of this representation of an object.
30+
Servers should convert recognized schemas to the latest internal value, and
31+
may reject unrecognized values.
32+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3133
type: string
3234
kind:
33-
description: 'Kind is a string value representing the REST resource this
34-
object represents. Servers may infer this from the endpoint the client
35-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
35+
description: |-
36+
Kind is a string value representing the REST resource this object represents.
37+
Servers may infer this from the endpoint the client submits requests to.
38+
Cannot be updated.
39+
In CamelCase.
40+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3641
type: string
3742
metadata:
3843
type: object
@@ -56,14 +61,13 @@ spec:
5661
to use when bootstrapping EKS.
5762
type: string
5863
dnsClusterIP:
59-
description: DNSClusterIP overrides the IP address to use
60-
for DNS queries within the cluster.
64+
description: ' DNSClusterIP overrides the IP address to use
65+
for DNS queries within the cluster.'
6166
type: string
6267
dockerConfigJson:
63-
description: DockerConfigJson is used for the contents of
64-
the /etc/docker/daemon.json file. Useful if you want a custom
65-
config differing from the default one in the AMI. This is
66-
expected to be a json string.
68+
description: |-
69+
DockerConfigJson is used for the contents of the /etc/docker/daemon.json file. Useful if you want a custom config differing from the default one in the AMI.
70+
This is expected to be a json string.
6771
type: string
6872
kubeletExtraArgs:
6973
additionalProperties:
@@ -76,8 +80,8 @@ spec:
7680
container to use.
7781
properties:
7882
accountNumber:
79-
description: AccountNumber is the AWS account number to
80-
pull the pause container from.
83+
description: ' AccountNumber is the AWS account number
84+
to pull the pause container from.'
8185
type: string
8286
version:
8387
description: Version is the tag of the pause container
@@ -88,9 +92,9 @@ spec:
8892
- version
8993
type: object
9094
serviceIPV6Cidr:
91-
description: ServiceIPV6Cidr is the ipv6 cidr range of the
92-
cluster. If this is specified then the ip family will be
93-
set to ipv6.
95+
description: |-
96+
ServiceIPV6Cidr is the ipv6 cidr range of the cluster. If this is specified then
97+
the ip family will be set to ipv6.
9498
type: string
9599
useMaxPods:
96100
description: UseMaxPods sets --max-pods for the kubelet when
@@ -111,14 +115,19 @@ spec:
111115
API.
112116
properties:
113117
apiVersion:
114-
description: 'APIVersion defines the versioned schema of this representation
115-
of an object. Servers should convert recognized schemas to the latest
116-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
118+
description: |-
119+
APIVersion defines the versioned schema of this representation of an object.
120+
Servers should convert recognized schemas to the latest internal value, and
121+
may reject unrecognized values.
122+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
117123
type: string
118124
kind:
119-
description: 'Kind is a string value representing the REST resource this
120-
object represents. Servers may infer this from the endpoint the client
121-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
125+
description: |-
126+
Kind is a string value representing the REST resource this object represents.
127+
Servers may infer this from the endpoint the client submits requests to.
128+
Cannot be updated.
129+
In CamelCase.
130+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
122131
type: string
123132
metadata:
124133
type: object
@@ -174,10 +183,9 @@ spec:
174183
to be used. If set to None, no label is used.
175184
type: string
176185
overwrite:
177-
description: Overwrite defines whether or not to
178-
overwrite any existing filesystem. If true, any
179-
pre-existing file system will be destroyed. Use
180-
with Caution.
186+
description: |-
187+
Overwrite defines whether or not to overwrite any existing filesystem.
188+
If true, any pre-existing file system will be destroyed. Use with Caution.
181189
type: boolean
182190
partition:
183191
description: 'Partition specifies the partition
@@ -202,22 +210,21 @@ spec:
202210
description: Device is the name of the device.
203211
type: string
204212
layout:
205-
description: Layout specifies the device layout.
206-
If it is true, a single partition will be created
207-
for the entire device. When layout is false, it
208-
means don't partition or ignore existing partitioning.
213+
description: |-
214+
Layout specifies the device layout.
215+
If it is true, a single partition will be created for the entire device.
216+
When layout is false, it means don't partition or ignore existing partitioning.
209217
type: boolean
210218
overwrite:
211-
description: Overwrite describes whether to skip
212-
checks and create the partition if a partition
213-
or filesystem is found on the device. Use with
214-
caution. Default is 'false'.
219+
description: |-
220+
Overwrite describes whether to skip checks and create the partition if a partition or filesystem is found on the device.
221+
Use with caution. Default is 'false'.
215222
type: boolean
216223
tableType:
217-
description: 'TableType specifies the tupe of partition
218-
table. The following are supported: ''mbr'': default
219-
and setups a MS-DOS partition table ''gpt'': setups
220-
a GPT partition table'
224+
description: |-
225+
TableType specifies the tupe of partition table. The following are supported:
226+
'mbr': default and setups a MS-DOS partition table
227+
'gpt': setups a GPT partition table
221228
type: string
222229
required:
223230
- device
@@ -226,14 +233,13 @@ spec:
226233
type: array
227234
type: object
228235
dnsClusterIP:
229-
description: DNSClusterIP overrides the IP address to use
230-
for DNS queries within the cluster.
236+
description: ' DNSClusterIP overrides the IP address to use
237+
for DNS queries within the cluster.'
231238
type: string
232239
dockerConfigJson:
233-
description: DockerConfigJson is used for the contents of
234-
the /etc/docker/daemon.json file. Useful if you want a custom
235-
config differing from the default one in the AMI. This is
236-
expected to be a json string.
240+
description: |-
241+
DockerConfigJson is used for the contents of the /etc/docker/daemon.json file. Useful if you want a custom config differing from the default one in the AMI.
242+
This is expected to be a json string.
237243
type: string
238244
files:
239245
description: Files specifies extra files to be passed to user_data
@@ -329,8 +335,8 @@ spec:
329335
container to use.
330336
properties:
331337
accountNumber:
332-
description: AccountNumber is the AWS account number to
333-
pull the pause container from.
338+
description: ' AccountNumber is the AWS account number
339+
to pull the pause container from.'
334340
type: string
335341
version:
336342
description: Version is the tag of the pause container
@@ -353,9 +359,9 @@ spec:
353359
type: string
354360
type: array
355361
serviceIPV6Cidr:
356-
description: ServiceIPV6Cidr is the ipv6 cidr range of the
357-
cluster. If this is specified then the ip family will be
358-
set to ipv6.
362+
description: |-
363+
ServiceIPV6Cidr is the ipv6 cidr range of the cluster. If this is specified then
364+
the ip family will be set to ipv6.
359365
type: string
360366
useMaxPods:
361367
description: UseMaxPods sets --max-pods for the kubelet when

0 commit comments

Comments
 (0)