Skip to content

Commit

Permalink
bump to capi v1.7.0 (kubernetes-sigs#4897)
Browse files Browse the repository at this point in the history 
- bump deps for capi v1.7.x
- enable MachinePools by default
- use capi v1.7.0
  • Loading branch information
@damdo @fad3t
damdo authored and fad3t committed Oct 8, 2024
1 parent 05eba34 commit a8d4494
Show file tree
Hide file tree
Showing 29 changed files with 4,419 additions and 4,218 deletions.
178 changes: 95 additions & 83 deletions config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigs.yaml
View file

Large diffs are not rendered by default.

108 changes: 57 additions & 51 deletions config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigtemplates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: eksconfigtemplates.bootstrap.cluster.x-k8s.io
spec:
group: bootstrap.cluster.x-k8s.io
Expand All @@ -25,14 +25,19 @@ spec:
API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -56,14 +61,13 @@ spec:
to use when bootstrapping EKS.
type: string
dnsClusterIP:
description: DNSClusterIP overrides the IP address to use
for DNS queries within the cluster.
description: ' DNSClusterIP overrides the IP address to use
for DNS queries within the cluster.'
type: string
dockerConfigJson:
description: 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. This is
expected to be a json string.
description: |-
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.
This is expected to be a json string.
type: string
kubeletExtraArgs:
additionalProperties:
Expand All @@ -76,8 +80,8 @@ spec:
container to use.
properties:
accountNumber:
description: AccountNumber is the AWS account number to
pull the pause container from.
description: ' AccountNumber is the AWS account number
to pull the pause container from.'
type: string
version:
description: Version is the tag of the pause container
Expand All @@ -88,9 +92,9 @@ spec:
- version
type: object
serviceIPV6Cidr:
description: ServiceIPV6Cidr is the ipv6 cidr range of the
cluster. If this is specified then the ip family will be
set to ipv6.
description: |-
ServiceIPV6Cidr is the ipv6 cidr range of the cluster. If this is specified then
the ip family will be set to ipv6.
type: string
useMaxPods:
description: UseMaxPods sets --max-pods for the kubelet when
Expand All @@ -111,14 +115,19 @@ spec:
API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down Expand Up @@ -174,10 +183,9 @@ spec:
to be used. If set to None, no label is used.
type: string
overwrite:
description: Overwrite defines whether or not to
overwrite any existing filesystem. If true, any
pre-existing file system will be destroyed. Use
with Caution.
description: |-
Overwrite defines whether or not to overwrite any existing filesystem.
If true, any pre-existing file system will be destroyed. Use with Caution.
type: boolean
partition:
description: 'Partition specifies the partition
Expand All @@ -202,22 +210,21 @@ spec:
description: Device is the name of the device.
type: string
layout:
description: Layout specifies the device layout.
If it is true, a single partition will be created
for the entire device. When layout is false, it
means don't partition or ignore existing partitioning.
description: |-
Layout specifies the device layout.
If it is true, a single partition will be created for the entire device.
When layout is false, it means don't partition or ignore existing partitioning.
type: boolean
overwrite:
description: Overwrite describes whether to skip
checks and create the partition if a partition
or filesystem is found on the device. Use with
caution. Default is 'false'.
description: |-
Overwrite describes whether to skip checks and create the partition if a partition or filesystem is found on the device.
Use with caution. Default is 'false'.
type: boolean
tableType:
description: 'TableType specifies the tupe of partition
table. The following are supported: ''mbr'': default
and setups a MS-DOS partition table ''gpt'': setups
a GPT partition table'
description: |-
TableType specifies the tupe of partition table. The following are supported:
'mbr': default and setups a MS-DOS partition table
'gpt': setups a GPT partition table
type: string
required:
- device
Expand All @@ -226,14 +233,13 @@ spec:
type: array
type: object
dnsClusterIP:
description: DNSClusterIP overrides the IP address to use
for DNS queries within the cluster.
description: ' DNSClusterIP overrides the IP address to use
for DNS queries within the cluster.'
type: string
dockerConfigJson:
description: 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. This is
expected to be a json string.
description: |-
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.
This is expected to be a json string.
type: string
files:
description: Files specifies extra files to be passed to user_data
Expand Down Expand Up @@ -329,8 +335,8 @@ spec:
container to use.
properties:
accountNumber:
description: AccountNumber is the AWS account number to
pull the pause container from.
description: ' AccountNumber is the AWS account number
to pull the pause container from.'
type: string
version:
description: Version is the tag of the pause container
Expand All @@ -353,9 +359,9 @@ spec:
type: string
type: array
serviceIPV6Cidr:
description: ServiceIPV6Cidr is the ipv6 cidr range of the
cluster. If this is specified then the ip family will be
set to ipv6.
description: |-
ServiceIPV6Cidr is the ipv6 cidr range of the cluster. If this is specified then
the ip family will be set to ipv6.
type: string
useMaxPods:
description: UseMaxPods sets --max-pods for the kubelet when
Expand Down
Loading

0 comments on commit a8d4494

Please sign in to comment.