Skip to content

Commit

Permalink
Update CRDs for openshift/cluster-api#34
Browse files Browse the repository at this point in the history
  • Loading branch information
@enxebre
enxebre committed Apr 29, 2019
1 parent 3c17163 commit b302880
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 116 deletions.
73 changes: 0 additions & 73 deletions install/0000_30_machine-api-operator_02_machine.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,6 @@ spec:
type: object
spec:
properties:
configSource:
description: ConfigSource is used to populate in the associated Node
for dynamic kubelet config. This field already exists in Node, so
any updates to it in the Machine spec will be automatically copied
to the linked NodeRef from the status. The rest of dynamic kubelet
config support should then work as-is.
type: object
metadata:
description: ObjectMeta will autopopulate the Node created. Use this
to indicate what labels, annotations, name prefix, etc., should be
Expand Down Expand Up @@ -93,20 +86,6 @@ spec:
their own versioned API types that should be serialized/deserialized
from this field, akin to component config.
type: object
valueFrom:
description: Source for the provider configuration. Cannot be used
if value is not empty.
properties:
machineClass:
description: The machine class from which the provider config
should be sourced.
properties:
provider:
description: Provider is the name of the cloud-provider
which MachineClass is intended for.
type: string
type: object
type: object
type: object
taints:
description: Taints is the full, authoritative list of taints to apply
Expand All @@ -115,25 +94,6 @@ spec:
items:
type: object
type: array
versions:
description: Versions of key software to use. This field is optional
at cluster creation time, and omitting the field indicates that the
cluster installation tool should select defaults for the user. These
defaults may differ based on the cluster installer, but the tool should
populate the values it uses when persisting Machine objects. A Machine
spec missing this field at runtime is invalid.
properties:
controlPlane:
description: ControlPlane is the semantic version of the Kubernetes
control plane to run. This should only be populated when the machine
is a control plane.
type: string
kubelet:
description: Kubelet is the semantic version of kubelet to run
type: string
required:
- kubelet
type: object
required:
- providerSpec
type: object
Expand All @@ -145,15 +105,6 @@ spec:
items:
type: object
type: array
conditions:
description: 'Conditions lists the conditions synced from the node conditions
of the corresponding node-object. Machine-controller is responsible
for keeping conditions up-to-date. MachineSet controller will be taking
these conditions as a signal to decide if machine is healthy or needs
to be replaced. Refer: https://kubernetes.io/docs/concepts/architecture/nodes/#condition'
items:
type: object
type: array
errorMessage:
description: ErrorMessage will be set in the event that there is a terminal
problem reconciling the Machine and will contain a more verbose string
Expand Down Expand Up @@ -225,30 +176,6 @@ spec:
recommended that providers maintain their own versioned API types
that should be serialized/deserialized from this field.
type: object
versions:
description: 'Versions specifies the current versions of software on
the corresponding Node (if it exists). This is provided for a few
reasons: 1) It is more convenient than checking the NodeRef, traversing
it to the Node, and finding the appropriate field in Node.Status.NodeInfo (which
uses different field names and formatting). 2) It removes some of
the dependency on the structure of the Node, so that if the structure
of Node.Status.NodeInfo changes, only machine controllers need
to be updated, rather than every client of the Machines API. 3)
There is no other simple way to check the control plane version.
A client would have to connect directly to the apiserver running
on the target node in order to find out its version.'
properties:
controlPlane:
description: ControlPlane is the semantic version of the Kubernetes
control plane to run. This should only be populated when the machine
is a control plane.
type: string
kubelet:
description: Kubelet is the semantic version of kubelet to run
type: string
required:
- kubelet
type: object
type: object
version: v1beta1
status:
Expand Down
43 changes: 0 additions & 43 deletions install/0000_30_machine-api-operator_03_machineset.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,6 @@ spec:
description: 'Specification of the desired behavior of the machine.
More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
properties:
configSource:
description: ConfigSource is used to populate in the associated
Node for dynamic kubelet config. This field already exists
in Node, so any updates to it in the Machine spec will be
automatically copied to the linked NodeRef from the status.
The rest of dynamic kubelet config support should then work
as-is.
type: object
metadata:
description: ObjectMeta will autopopulate the Node created.
Use this to indicate what labels, annotations, name prefix,
Expand Down Expand Up @@ -126,20 +118,6 @@ spec:
should be serialized/deserialized from this field, akin
to component config.
type: object
valueFrom:
description: Source for the provider configuration. Cannot
be used if value is not empty.
properties:
machineClass:
description: The machine class from which the provider
config should be sourced.
properties:
provider:
description: Provider is the name of the cloud-provider
which MachineClass is intended for.
type: string
type: object
type: object
type: object
taints:
description: Taints is the full, authoritative list of taints
Expand All @@ -148,27 +126,6 @@ spec:
items:
type: object
type: array
versions:
description: Versions of key software to use. This field is
optional at cluster creation time, and omitting the field
indicates that the cluster installation tool should select
defaults for the user. These defaults may differ based on
the cluster installer, but the tool should populate the values
it uses when persisting Machine objects. A Machine spec missing
this field at runtime is invalid.
properties:
controlPlane:
description: ControlPlane is the semantic version of the
Kubernetes control plane to run. This should only be populated
when the machine is a control plane.
type: string
kubelet:
description: Kubelet is the semantic version of kubelet
to run
type: string
required:
- kubelet
type: object
required:
- providerSpec
type: object
Expand Down

0 comments on commit b302880

Please sign in to comment.