-
Notifications
You must be signed in to change notification settings - Fork 588
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4725 from muraee/rosa-machine-mgmt
✨ ROSA machinePools support
- Loading branch information
Showing
24 changed files
with
1,509 additions
and
148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
168 changes: 168 additions & 0 deletions
168
config/crd/bases/infrastructure.cluster.x-k8s.io_rosamachinepools.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| controller-gen.kubebuilder.io/version: v0.12.1 | ||
| name: rosamachinepools.infrastructure.cluster.x-k8s.io | ||
| spec: | ||
| group: infrastructure.cluster.x-k8s.io | ||
| names: | ||
| categories: | ||
| - cluster-api | ||
| kind: ROSAMachinePool | ||
| listKind: ROSAMachinePoolList | ||
| plural: rosamachinepools | ||
| shortNames: | ||
| - rosamp | ||
| singular: rosamachinepool | ||
| scope: Namespaced | ||
| versions: | ||
| - additionalPrinterColumns: | ||
| - description: MachinePool ready status | ||
| jsonPath: .status.ready | ||
| name: Ready | ||
| type: string | ||
| - description: Number of replicas | ||
| jsonPath: .status.replicas | ||
| name: Replicas | ||
| type: integer | ||
| name: v1beta2 | ||
| schema: | ||
| openAPIV3Schema: | ||
| description: ROSAMachinePool is the Schema for the rosamachinepools 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' | ||
| 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' | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| description: RosaMachinePoolSpec defines the desired state of RosaMachinePool. | ||
| properties: | ||
| autoRepair: | ||
| default: false | ||
| description: AutoRepair specifies whether health checks should be | ||
| enabled for machines in the NodePool. The default is false. | ||
| type: boolean | ||
| autoscaling: | ||
| description: Autoscaling specifies auto scaling behaviour for this | ||
| MachinePool. required if Replicas is not configured | ||
| properties: | ||
| maxReplicas: | ||
| minimum: 1 | ||
| type: integer | ||
| minReplicas: | ||
| minimum: 1 | ||
| type: integer | ||
| type: object | ||
| availabilityZone: | ||
| description: AvailabilityZone is an optinal field specifying the availability | ||
| zone where instances of this machine pool should run For Multi-AZ | ||
| clusters, you can create a machine pool in a Single-AZ of your choice. | ||
| type: string | ||
| instanceType: | ||
| description: InstanceType specifies the AWS instance type | ||
| type: string | ||
| labels: | ||
| additionalProperties: | ||
| type: string | ||
| description: Labels specifies labels for the Kubernetes node objects | ||
| type: object | ||
| nodePoolName: | ||
| description: NodePoolName specifies the name of the nodepool in Rosa | ||
| must be a valid DNS-1035 label, so it must consist of lower case | ||
| alphanumeric and have a max length of 15 characters. | ||
| maxLength: 15 | ||
| pattern: ^[a-z]([-a-z0-9]*[a-z0-9])?$ | ||
| type: string | ||
| x-kubernetes-validations: | ||
| - message: nodepoolName is immutable | ||
| rule: self == oldSelf | ||
| providerIDList: | ||
| description: ProviderIDList contain a ProviderID for each machine | ||
| instance that's currently managed by this machine pool. | ||
| items: | ||
| type: string | ||
| type: array | ||
| subnet: | ||
| type: string | ||
| required: | ||
| - nodePoolName | ||
| type: object | ||
| status: | ||
| description: RosaMachinePoolStatus defines the observed state of RosaMachinePool. | ||
| properties: | ||
| conditions: | ||
| description: Conditions defines current service state of the managed | ||
| machine pool | ||
| items: | ||
| description: Condition defines an observation of a Cluster API resource | ||
| operational state. | ||
| properties: | ||
| lastTransitionTime: | ||
| description: Last time the condition transitioned from one status | ||
| to another. This should be when the underlying condition changed. | ||
| If that is not known, then using the time when the API field | ||
| changed is acceptable. | ||
| format: date-time | ||
| type: string | ||
| message: | ||
| description: A human readable message indicating details about | ||
| the transition. This field may be empty. | ||
| type: string | ||
| reason: | ||
| description: The reason for the condition's last transition | ||
| in CamelCase. The specific API may choose whether or not this | ||
| field is considered a guaranteed API. This field may not be | ||
| empty. | ||
| type: string | ||
| severity: | ||
| description: Severity provides an explicit classification of | ||
| Reason code, so the users or machines can immediately understand | ||
| the current situation and act accordingly. The Severity field | ||
| MUST be set only when Status=False. | ||
| type: string | ||
| status: | ||
| description: Status of the condition, one of True, False, Unknown. | ||
| type: string | ||
| type: | ||
| description: Type of condition in CamelCase or in foo.example.com/CamelCase. | ||
| Many .condition.type values are consistent across resources | ||
| like Available, but because arbitrary conditions can be useful | ||
| (see .node.status.conditions), the ability to deconflict is | ||
| important. | ||
| type: string | ||
| required: | ||
| - lastTransitionTime | ||
| - status | ||
| - type | ||
| type: object | ||
| type: array | ||
| id: | ||
| description: ID is the ID given by ROSA. | ||
| type: string | ||
| ready: | ||
| default: false | ||
| description: Ready denotes that the RosaMachinePool nodepool has joined | ||
| the cluster | ||
| type: boolean | ||
| replicas: | ||
| description: Replicas is the most recently observed number of replicas. | ||
| format: int32 | ||
| type: integer | ||
| required: | ||
| - ready | ||
| type: object | ||
| type: object | ||
| served: true | ||
| storage: true | ||
| subresources: | ||
| status: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1beta2 | ||
|
|
||
| import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" | ||
|
|
||
| const ( | ||
| // ROSAControlPlaneReadyCondition condition reports on the successful reconciliation of ROSAControlPlane. | ||
| ROSAControlPlaneReadyCondition clusterv1.ConditionType = "ROSAControlPlaneReady" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.