Skip to content

Commit

Permalink
Update CAPA version to v2.0.2
Browse files Browse the repository at this point in the history 
Updated CAPA version to v2.0.2. This required a few other dependency related updates: CAPI, CAPI for Azure, and removing the replace statement for CAPI to be at v1.0.0.

Signed-off-by: Bryan Cox <[email protected]>
  • Loading branch information
@bryan-cox
bryan-cox committed Jan 4, 2023
1 parent b5740e5 commit 1ddc7a5
Show file tree
Hide file tree
Showing 733 changed files with 92,573 additions and 177,178 deletions.
33 changes: 33 additions & 0 deletions cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ spec:
registered instances in its Availability Zone only. \n Defaults
to false."
type: boolean
healthCheckProtocol:
description: HealthCheckProtocol sets the protocol type for classic
ELB health check target default value is ClassicELBProtocolSSL
type: string
name:
description: Name sets the name of the classic ELB load balancer.
As per AWS, the name must be unique within your set of load
Expand Down Expand Up @@ -338,6 +342,35 @@ spec:
region:
description: The AWS Region the cluster lives in.
type: string
s3Bucket:
description: S3Bucket contains options to configure a supporting S3
bucket for this cluster - currently used for nodes requiring Ignition
(https://coreos.github.io/ignition/) for bootstrapping (requires
BootstrapFormatIgnition feature flag to be enabled).
properties:
controlPlaneIAMInstanceProfile:
description: ControlPlaneIAMInstanceProfile is a name of the IAMInstanceProfile,
which will be allowed to read control-plane node bootstrap data
from S3 Bucket.
type: string
name:
description: Name defines name of S3 Bucket to be created.
maxLength: 63
minLength: 3
pattern: ^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$
type: string
nodesIAMInstanceProfiles:
description: NodesIAMInstanceProfiles is a list of IAM instance
profiles, which will be allowed to read worker nodes bootstrap
data from S3 Bucket.
items:
type: string
type: array
required:
- controlPlaneIAMInstanceProfile
- name
- nodesIAMInstanceProfiles
type: object
sshKeyName:
description: SSHKeyName is the name of the ssh key to attach to the
bastion host. Valid values are empty string (do not use SSH keys),
Expand Down
42 changes: 41 additions & 1 deletion .../assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ spec:
singular: awsclustertemplate
scope: Namespaced
versions:
- name: v1beta1
- additionalPrinterColumns:
- description: Time duration since creation of AWSClusterTemplate
jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1beta1
schema:
openAPIV3Schema:
description: AWSClusterTemplate is the schema for Amazon EC2 based Kubernetes
Expand Down Expand Up @@ -146,6 +151,11 @@ spec:
registered instances in its Availability Zone only.
\n Defaults to false."
type: boolean
healthCheckProtocol:
description: HealthCheckProtocol sets the protocol type
for classic ELB health check target default value is
ClassicELBProtocolSSL
type: string
name:
description: Name sets the name of the classic ELB load
balancer. As per AWS, the name must be unique within
Expand Down Expand Up @@ -357,6 +367,35 @@ spec:
region:
description: The AWS Region the cluster lives in.
type: string
s3Bucket:
description: S3Bucket contains options to configure a supporting
S3 bucket for this cluster - currently used for nodes requiring
Ignition (https://coreos.github.io/ignition/) for bootstrapping
(requires BootstrapFormatIgnition feature flag to be enabled).
properties:
controlPlaneIAMInstanceProfile:
description: ControlPlaneIAMInstanceProfile is a name
of the IAMInstanceProfile, which will be allowed to
read control-plane node bootstrap data from S3 Bucket.
type: string
name:
description: Name defines name of S3 Bucket to be created.
maxLength: 63
minLength: 3
pattern: ^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$
type: string
nodesIAMInstanceProfiles:
description: NodesIAMInstanceProfiles is a list of IAM
instance profiles, which will be allowed to read worker
nodes bootstrap data from S3 Bucket.
items:
type: string
type: array
required:
- controlPlaneIAMInstanceProfile
- name
- nodesIAMInstanceProfiles
type: object
sshKeyName:
description: SSHKeyName is the name of the ssh key to attach
to the bastion host. Valid values are empty string (do not
Expand All @@ -373,3 +412,4 @@ spec:
type: object
served: true
storage: true
subresources: {}
19 changes: 10 additions & 9 deletions ...tall/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@ spec:
groups defined at the cluster level or in the actuator.
items:
description: AWSResourceReference is a reference to a specific
AWS resource by ID, ARN, or filters. Only one of ID, ARN or
Filters may be specified. Specifying more than one will result
in a validation error.
AWS resource by ID or filters. Only one of ID or Filters may
be specified. Specifying more than one will result in a validation
error.
properties:
arn:
description: ARN of resource
description: 'ARN of resource. Deprecated: This field has
no function and is going to be removed in the next release.'
type: string
filters:
description: 'Filters is a set of key/value pairs used to
Expand Down Expand Up @@ -242,7 +243,7 @@ spec:
default: 1
description: MinSize defines the minimum size of the group.
format: int32
minimum: 1
minimum: 0
type: integer
mixedInstancesPolicy:
description: MixedInstancesPolicy describes how multiple instance
Expand Down Expand Up @@ -328,12 +329,12 @@ spec:
description: Subnets is an array of subnet configurations
items:
description: AWSResourceReference is a reference to a specific AWS
resource by ID, ARN, or filters. Only one of ID, ARN or Filters
may be specified. Specifying more than one will result in a validation
error.
resource by ID or filters. Only one of ID or Filters may be specified.
Specifying more than one will result in a validation error.
properties:
arn:
description: ARN of resource
description: 'ARN of resource. Deprecated: This field has no
function and is going to be removed in the next release.'
type: string
filters:
description: 'Filters is a set of key/value pairs used to identify
Expand Down
23 changes: 18 additions & 5 deletions cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmachines.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ spec:
change too.
items:
description: AWSResourceReference is a reference to a specific AWS
resource by ID, ARN, or filters. Only one of ID, ARN or Filters
may be specified. Specifying more than one will result in a validation
error.
resource by ID or filters. Only one of ID or Filters may be specified.
Specifying more than one will result in a validation error.
properties:
arn:
description: ARN of resource
description: 'ARN of resource. Deprecated: This field has no
function and is going to be removed in the next release.'
type: string
filters:
description: 'Filters is a set of key/value pairs used to identify
Expand Down Expand Up @@ -169,6 +169,18 @@ spec:
description: IAMInstanceProfile is a name of an IAM instance profile
to assign to the instance
type: string
ignition:
description: Ignition defined options related to the bootstrapping
systems where Ignition is used.
properties:
version:
default: "2.3"
description: Version defines which version of Ignition will be
used to generate bootstrap data.
enum:
- "2.3"
type: string
type: object
imageLookupBaseOS:
description: ImageLookupBaseOS is the name of the base operating system
to use for image lookup the AMI is not set.
Expand Down Expand Up @@ -317,7 +329,8 @@ spec:
If not specified, the cluster subnet will be used.
properties:
arn:
description: ARN of resource
description: 'ARN of resource. Deprecated: This field has no function
and is going to be removed in the next release.'
type: string
filters:
description: 'Filters is a set of key/value pairs used to identify
Expand Down
26 changes: 21 additions & 5 deletions .../assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,14 @@ spec:
the attached security groups might change too.
items:
description: AWSResourceReference is a reference to a specific
AWS resource by ID, ARN, or filters. Only one of ID, ARN
or Filters may be specified. Specifying more than one
will result in a validation error.
AWS resource by ID or filters. Only one of ID or Filters
may be specified. Specifying more than one will result
in a validation error.
properties:
arn:
description: ARN of resource
description: 'ARN of resource. Deprecated: This field
has no function and is going to be removed in the
next release.'
type: string
filters:
description: 'Filters is a set of key/value pairs used
Expand Down Expand Up @@ -181,6 +183,18 @@ spec:
description: IAMInstanceProfile is a name of an IAM instance
profile to assign to the instance
type: string
ignition:
description: Ignition defined options related to the bootstrapping
systems where Ignition is used.
properties:
version:
default: "2.3"
description: Version defines which version of Ignition
will be used to generate bootstrap data.
enum:
- "2.3"
type: string
type: object
imageLookupBaseOS:
description: ImageLookupBaseOS is the name of the base operating
system to use for image lookup the AMI is not set.
Expand Down Expand Up @@ -337,7 +351,9 @@ spec:
be used.
properties:
arn:
description: ARN of resource
description: 'ARN of resource. Deprecated: This field
has no function and is going to be removed in the next
release.'
type: string
filters:
description: 'Filters is a set of key/value pairs used
Expand Down
19 changes: 19 additions & 0 deletions ...sets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,25 @@ spec:
- value
type: object
type: array
updateConfig:
description: UpdateConfig holds the optional config to control the
behaviour of the update to the nodegroup.
properties:
maxUnavailable:
description: MaxUnavailable is the maximum number of nodes unavailable
at once during a version update. Nodes will be updated in parallel.
The maximum number is 100.
maximum: 100
minimum: 1
type: integer
maxUnavailablePrecentage:
description: MaxUnavailablePercentage is the maximum percentage
of nodes unavailable during a version update. This percentage
of nodes will be updated in parallel, up to 100 nodes at once.
maximum: 100
minimum: 1
type: integer
type: object
type: object
status:
description: AWSManagedMachinePoolStatus defines the observed state of
Expand Down
14 changes: 9 additions & 5 deletions ...ts/cluster-api-provider-azure/infrastructure.cluster.x-k8s.io_azureclusteridentities.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientID:
description: Both User Assigned MSI and SP can use this field.
description: ClientID is the service principal client ID. Both User
Assigned MSI and SP can use this field.
type: string
clientSecret:
description: ClientSecret is a secret reference which should contain
Expand All @@ -126,17 +127,20 @@ spec:
type: object
x-kubernetes-map-type: atomic
resourceID:
description: User assigned MSI resource id.
description: ResourceID is the Azure resource ID for the User Assigned
MSI resource. Only applicable when type is UserAssignedMSI.
type: string
tenantID:
description: Service principal primary tenant id.
description: TenantID is the service principal primary tenant id.
type: string
type:
description: UserAssignedMSI or Service Principal
description: Type is the type of Azure Identity used. ServicePrincipal,
ServicePrincipalCertificate, UserAssignedMSI or ManualServicePrincipal.
enum:
- ServicePrincipal
- ManualServicePrincipal
- UserAssignedMSI
- ManualServicePrincipal
- ServicePrincipalCertificate
type: string
required:
- clientID
Expand Down
Loading

0 comments on commit 1ddc7a5

Please sign in to comment.