Skip to content
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.

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

Removing node field from machine status #745

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ test-clean:
@rm -f $(COVERPROFILE)

generate: controller-gen
$(CONTROLLER_GEN) crd paths=./pkg/apis/machine/v1alpha1... output:crd:dir=kubernetes/crds output:stdout
$(CONTROLLER_GEN) crd paths=./pkg/apis/machine/v1alpha1/... output:crd:dir=kubernetes/crds output:stdout
@./hack/generate-code
@./hack/api-reference/generate-spec-doc.sh

Expand All @@ -163,7 +163,7 @@ ifeq (, $(shell which controller-gen))
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2 ;\
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
Expand Down
33 changes: 8 additions & 25 deletions docs/documents/apis.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
---
title: APIs
---

## Specification

### ProviderSpec Schema
<br>
<h3 id="AWSMachineClass">
Expand Down Expand Up @@ -2793,9 +2788,10 @@ string
</p>
<p>
<p>AzureLinuxConfiguration is specifies the Linux operating system settings on the virtual machine. <br><br>For a list of
supported Linux distributions, see <a href="https://docs.microsoft.com/en-us/azure/virtual-machines/linux/endorsed-distros">Endorsed Linux distributions on Azure
supported Linux distributions, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json">Linux on Azure-Endorsed
Distributions</a>
<br><br> For running non-endorsed distributions, see <a href="https://docs.microsoft.com/en-us/azure/virtual-machines/linux/create-upload-generic">Information for community supported and non-endorsed distributions</a>.</p>
<br><br> For running non-endorsed distributions, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json">Information for Non-Endorsed
Distributions</a>.</p>
</p>
<table>
<thead>
Expand Down Expand Up @@ -3179,8 +3175,9 @@ AzureNetworkInterfaceReference
<a href="#AzureStorageProfile">AzureStorageProfile</a>)
</p>
<p>
<p>AzureOSDisk specifies information about the operating system disk used by the virtual machine. <br><br> For more
information about disks, see <a href="https://docs.microsoft.com/en-us/azure/virtual-machines/managed-disks-overview">Introduction to Azure managed disks</a>.</p>
<p>AzureOSDisk is specifies information about the operating system disk used by the virtual machine. <br><br> For more
information about disks, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json">About disks and VHDs for Azure virtual
machines</a>.</p>
</p>
<table>
<thead>
Expand Down Expand Up @@ -5747,19 +5744,6 @@ MachineConfiguration
<tbody>
<tr>
<td>
<code>node</code>
</td>
<td>
<em>
string
</em>
</td>
<td>
<p>Node string</p>
</td>
</tr>
<tr>
<td>
<code>conditions</code>
</td>
<td>
Expand Down Expand Up @@ -5927,8 +5911,7 @@ Kubernetes meta/v1.ObjectMeta
<td>
<em>(Optional)</em>
<p>Standard object&rsquo;s metadata.
More info: <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata
">API Conventions - Metadata</a></p>
More info: <a href="https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata">https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata</a></p>
Refer to the Kubernetes API documentation for the fields of the
<code>metadata</code> field.
</td>
Expand All @@ -5947,7 +5930,7 @@ MachineSpec
<td>
<em>(Optional)</em>
<p>Specification of the desired behavior of the machine.
More info: <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status">API Conventions - Spec and Status</a></p>
More info: <a href="https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status">https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status</a></p>
<br/>
<br/>
<table>
Expand Down
97 changes: 49 additions & 48 deletions docs/todo/outline.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: alicloudmachineclasses.machine.sapcloud.io
spec:
Expand Down Expand Up @@ -65,6 +64,7 @@ spec:
name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
dataDisks:
items:
properties:
Expand Down Expand Up @@ -113,6 +113,7 @@ spec:
name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
securityGroupID:
type: string
spotStrategy:
Expand Down Expand Up @@ -147,9 +148,3 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
11 changes: 3 additions & 8 deletions kubernetes/crds/machine.sapcloud.io_awsmachineclasses.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: awsmachineclasses.machine.sapcloud.io
spec:
Expand Down Expand Up @@ -151,6 +150,7 @@ spec:
name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
ebsOptimized:
type: boolean
iam:
Expand Down Expand Up @@ -220,6 +220,7 @@ spec:
name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
spotPrice:
type: string
tags:
Expand All @@ -231,9 +232,3 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
11 changes: 3 additions & 8 deletions kubernetes/crds/machine.sapcloud.io_azuremachineclasses.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: azuremachineclasses.machine.sapcloud.io
spec:
Expand Down Expand Up @@ -63,6 +62,7 @@ spec:
name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
location:
type: string
properties:
Expand Down Expand Up @@ -237,6 +237,7 @@ spec:
name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
subnetInfo:
description: AzureSubnetInfo is the information containing the subnet
details
Expand All @@ -257,9 +258,3 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
11 changes: 3 additions & 8 deletions kubernetes/crds/machine.sapcloud.io_gcpmachineclasses.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: gcpmachineclasses.machine.sapcloud.io
spec:
Expand Down Expand Up @@ -65,6 +64,7 @@ spec:
name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
deletionProtection:
type: boolean
description:
Expand Down Expand Up @@ -162,6 +162,7 @@ spec:
name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
serviceAccounts:
items:
description: GCPServiceAccount describes service accounts for GCP.
Expand Down Expand Up @@ -196,9 +197,3 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
11 changes: 3 additions & 8 deletions kubernetes/crds/machine.sapcloud.io_machineclasses.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: machineclasses.machine.sapcloud.io
spec:
Expand Down Expand Up @@ -42,6 +41,7 @@ spec:
must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
Expand Down Expand Up @@ -100,14 +100,9 @@ spec:
must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- providerSpec
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
10 changes: 2 additions & 8 deletions kubernetes/crds/machine.sapcloud.io_machinedeployments.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: machinedeployments.machine.sapcloud.io
spec:
Expand Down Expand Up @@ -148,6 +147,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
strategy:
description: The MachineDeployment strategy to use to replace existing
machines with new ones.
Expand Down Expand Up @@ -488,9 +488,3 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
12 changes: 1 addition & 11 deletions kubernetes/crds/machine.sapcloud.io_machines.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: machines.machine.sapcloud.io
spec:
Expand Down Expand Up @@ -269,18 +268,9 @@ spec:
description: Type of operation
type: string
type: object
node:
description: Node string
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
10 changes: 2 additions & 8 deletions kubernetes/crds/machine.sapcloud.io_machinesets.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: machinesets.machine.sapcloud.io
spec:
Expand Down Expand Up @@ -121,6 +120,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
template:
description: MachineTemplateSpec describes the data a machine should
have when created from a template
Expand Down Expand Up @@ -410,9 +410,3 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading