diff --git a/Makefile b/Makefile index a33f45696..b748590a0 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 diff --git a/docs/documents/apis.md b/docs/documents/apis.md index cd7066f5e..7592cd86a 100644 --- a/docs/documents/apis.md +++ b/docs/documents/apis.md @@ -1,9 +1,4 @@ ---- -title: APIs ---- - ## Specification - ### ProviderSpec Schema

@@ -2793,9 +2788,10 @@ string

AzureLinuxConfiguration is specifies the Linux operating system settings on the virtual machine.

For a list of -supported Linux distributions, see Endorsed Linux distributions on Azure +supported Linux distributions, see Linux on Azure-Endorsed Distributions -

For running non-endorsed distributions, see Information for community supported and non-endorsed distributions.

+

For running non-endorsed distributions, see Information for Non-Endorsed +Distributions.

@@ -3179,8 +3175,9 @@ AzureNetworkInterfaceReference AzureStorageProfile)

-

AzureOSDisk specifies information about the operating system disk used by the virtual machine.

For more -information about disks, see Introduction to Azure managed disks.

+

AzureOSDisk is specifies information about the operating system disk used by the virtual machine.

For more +information about disks, see About disks and VHDs for Azure virtual +machines.

@@ -5927,8 +5924,7 @@ Kubernetes meta/v1.ObjectMeta @@ -5947,7 +5943,7 @@ MachineSpec
(Optional)

Standard object’s metadata. -More info: API Conventions - Metadata

+More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata

Refer to the Kubernetes API documentation for the fields of the metadata field. 		(Optional)

Specification of the desired behavior of the machine. -More info: API Conventions - Spec and Status

+More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status



diff --git a/kubernetes/crds/machine.sapcloud.io_alicloudmachineclasses.yaml b/kubernetes/crds/machine.sapcloud.io_alicloudmachineclasses.yaml index 0daf2def9..a8745bf36 100644 --- a/kubernetes/crds/machine.sapcloud.io_alicloudmachineclasses.yaml +++ b/kubernetes/crds/machine.sapcloud.io_alicloudmachineclasses.yaml @@ -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: @@ -65,6 +64,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic dataDisks: items: properties: @@ -113,6 +113,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic securityGroupID: type: string spotStrategy: @@ -147,9 +148,3 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/kubernetes/crds/machine.sapcloud.io_awsmachineclasses.yaml b/kubernetes/crds/machine.sapcloud.io_awsmachineclasses.yaml index 41b3e37f6..3841cdd38 100644 --- a/kubernetes/crds/machine.sapcloud.io_awsmachineclasses.yaml +++ b/kubernetes/crds/machine.sapcloud.io_awsmachineclasses.yaml @@ -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: @@ -151,6 +150,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic ebsOptimized: type: boolean iam: @@ -220,6 +220,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic spotPrice: type: string tags: @@ -231,9 +232,3 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/kubernetes/crds/machine.sapcloud.io_azuremachineclasses.yaml b/kubernetes/crds/machine.sapcloud.io_azuremachineclasses.yaml index c636b6f52..a4a72ce7a 100644 --- a/kubernetes/crds/machine.sapcloud.io_azuremachineclasses.yaml +++ b/kubernetes/crds/machine.sapcloud.io_azuremachineclasses.yaml @@ -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: @@ -63,6 +62,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic location: type: string properties: @@ -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 @@ -257,9 +258,3 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/kubernetes/crds/machine.sapcloud.io_gcpmachineclasses.yaml b/kubernetes/crds/machine.sapcloud.io_gcpmachineclasses.yaml index f55408ff8..d7f3a87c5 100644 --- a/kubernetes/crds/machine.sapcloud.io_gcpmachineclasses.yaml +++ b/kubernetes/crds/machine.sapcloud.io_gcpmachineclasses.yaml @@ -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: @@ -65,6 +64,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic deletionProtection: type: boolean description: @@ -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. @@ -196,9 +197,3 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/kubernetes/crds/machine.sapcloud.io_machineclasses.yaml b/kubernetes/crds/machine.sapcloud.io_machineclasses.yaml index 6e0678f55..eb0a05b33 100644 --- a/kubernetes/crds/machine.sapcloud.io_machineclasses.yaml +++ b/kubernetes/crds/machine.sapcloud.io_machineclasses.yaml @@ -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: @@ -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 @@ -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: [] diff --git a/kubernetes/crds/machine.sapcloud.io_machinedeployments.yaml b/kubernetes/crds/machine.sapcloud.io_machinedeployments.yaml index 09af42a8a..8f6501d1a 100644 --- a/kubernetes/crds/machine.sapcloud.io_machinedeployments.yaml +++ b/kubernetes/crds/machine.sapcloud.io_machinedeployments.yaml @@ -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: @@ -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. @@ -488,9 +488,3 @@ spec: specReplicasPath: .spec.replicas statusReplicasPath: .status.replicas status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/kubernetes/crds/machine.sapcloud.io_machines.yaml b/kubernetes/crds/machine.sapcloud.io_machines.yaml index 7d82f0479..409349a4a 100644 --- a/kubernetes/crds/machine.sapcloud.io_machines.yaml +++ b/kubernetes/crds/machine.sapcloud.io_machines.yaml @@ -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: @@ -31,6 +30,11 @@ spec: jsonPath: .metadata.labels.node name: Node type: string + - description: ProviderID of the infra instance backing the machine object + jsonPath: .spec.providerID + name: ProviderID + priority: 1 + type: string name: v1alpha1 schema: openAPIV3Schema: @@ -278,9 +282,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/kubernetes/crds/machine.sapcloud.io_machinesets.yaml b/kubernetes/crds/machine.sapcloud.io_machinesets.yaml index bc62ed2d0..312bfa933 100644 --- a/kubernetes/crds/machine.sapcloud.io_machinesets.yaml +++ b/kubernetes/crds/machine.sapcloud.io_machinesets.yaml @@ -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: @@ -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 @@ -410,9 +410,3 @@ spec: specReplicasPath: .spec.replicas statusReplicasPath: .status.replicas status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/kubernetes/crds/machine.sapcloud.io_openstackmachineclasses.yaml b/kubernetes/crds/machine.sapcloud.io_openstackmachineclasses.yaml index faaa99ab5..34c67dfd1 100644 --- a/kubernetes/crds/machine.sapcloud.io_openstackmachineclasses.yaml +++ b/kubernetes/crds/machine.sapcloud.io_openstackmachineclasses.yaml @@ -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: openstackmachineclasses.machine.sapcloud.io spec: @@ -68,6 +67,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic flavorName: type: string imageID: @@ -108,6 +108,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic securityGroups: items: type: string @@ -137,9 +138,3 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/kubernetes/crds/machine.sapcloud.io_packetmachineclasses.yaml b/kubernetes/crds/machine.sapcloud.io_packetmachineclasses.yaml index 2c2565225..4bf6ef56f 100644 --- a/kubernetes/crds/machine.sapcloud.io_packetmachineclasses.yaml +++ b/kubernetes/crds/machine.sapcloud.io_packetmachineclasses.yaml @@ -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: packetmachineclasses.machine.sapcloud.io spec: @@ -60,6 +59,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic facility: items: type: string @@ -81,6 +81,7 @@ spec: name must be unique. type: string type: object + x-kubernetes-map-type: atomic sshKeys: items: type: string @@ -102,9 +103,3 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/pkg/apis/machine/v1alpha1/machine_types.go b/pkg/apis/machine/v1alpha1/machine_types.go index 4628562ec..e229d516e 100644 --- a/pkg/apis/machine/v1alpha1/machine_types.go +++ b/pkg/apis/machine/v1alpha1/machine_types.go @@ -34,6 +34,7 @@ import ( // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.currentStatus.phase`,description="Current status of the machine." // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`,description="CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\nPopulated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata" // +kubebuilder:printcolumn:name="Node",type=string,JSONPath=`.metadata.labels.node`,description="Node backing the machine object" +// +kubebuilder:printcolumn:name="ProviderID",type=string,JSONPath=`.spec.providerID`,description="ProviderID of the infra instance backing the machine object",priority=1 // Machine is the representation of a physical or virtual machine. type Machine struct {