Skip to content

Revert "Support both providerConfig and providerSpec under machine CRD's" #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert "Support both providerConfig and providerSpec under machine CRD's" #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 31 additions & 66 deletions install/0000_50_machine-api-operator_02_machine.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,75 +22,40 @@ spec:
metadata:
type: object
spec:
anyOf:
- type: object
properties:
configSource:
type: object
metadata:
type: object
providerSpec:
properties:
value:
type: object
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: object
taints:
items:
properties:
configSource:
type: object
metadata:
type: object
providerConfig:
properties:
value:
type: object
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
required:
- providerSpec
- type: object
properties:
configSource:
type: object
metadata:
type: object
providerConfig:
properties:
value:
type: object
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: object
taints:
items:
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
taints:
items:
type: object
required:
- providerConfig
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
required:
- providerConfig
type: object
status:
properties:
addresses:
Expand Down
101 changes: 33 additions & 68 deletions install/0000_50_machine-api-operator_03_machineset.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
metadata:
type: object
spec:
type: object
properties:
minReadySeconds:
format: int32
Expand All @@ -37,82 +36,48 @@ spec:
selector:
type: object
template:
type: object
properties:
metadata:
type: object
spec:
anyOf:
- type: object
properties:
configSource:
type: object
metadata:
type: object
providerSpec:
properties:
value:
type: object
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: object
taints:
items:
properties:
configSource:
type: object
metadata:
type: object
providerConfig:
properties:
value:
type: object
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
required:
- providerSpec
- type: object
properties:
configSource:
type: object
metadata:
type: object
providerConfig:
properties:
value:
type: object
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: object
taints:
items:
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
taints:
items:
type: object
required:
- providerConfig
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
required:
- providerConfig
type: object
type: object
required:
- selector
type: object
status:
properties:
availableReplicas:
Expand Down
101 changes: 33 additions & 68 deletions install/0000_50_machine-api-operator_04_machinedeployment.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
metadata:
type: object
spec:
type: object
properties:
minReadySeconds:
format: int32
Expand Down Expand Up @@ -55,83 +54,49 @@ spec:
type: string
type: object
template:
type: object
properties:
metadata:
type: object
spec:
anyOf:
- type: object
properties:
configSource:
type: object
metadata:
type: object
providerSpec:
properties:
value:
type: object
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: object
taints:
items:
properties:
configSource:
type: object
metadata:
type: object
providerConfig:
properties:
value:
type: object
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
required:
- providerSpec
- type: object
properties:
configSource:
type: object
metadata:
type: object
providerConfig:
properties:
value:
type: object
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: object
taints:
items:
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
taints:
items:
type: object
required:
- providerConfig
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
required:
- providerConfig
type: object
type: object
required:
- selector
- template
type: object
status:
properties:
availableReplicas:
Expand Down
34 changes: 11 additions & 23 deletions install/0000_50_machine-api-operator_06_machineclass.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,17 @@ spec:
scope: Namespaced
validation:
openAPIV3Schema:
anyOf:
- properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
providerSpec:
type: object
required:
- providerSpec
- properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
providerConfig:
type: object
required:
- providerConfig
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
providerConfig:
type: object
required:
- providerConfig
version: v1alpha1
status:
acceptedNames:
Expand Down