diff --git a/api/v1beta1/openstackmachine_types.go b/api/v1beta1/openstackmachine_types.go index 00025db7b6..7d271e78b5 100644 --- a/api/v1beta1/openstackmachine_types.go +++ b/api/v1beta1/openstackmachine_types.go @@ -199,6 +199,8 @@ type OpenStackMachineStatus struct { Addresses []corev1.NodeAddress `json:"addresses,omitempty"` // InstanceState is the state of the OpenStack instance for this machine. + // This field is not set anymore by the OpenStackMachine controller. + // Instead, it's set by the OpenStackServer controller. // +optional InstanceState *InstanceState `json:"instanceState,omitempty"` @@ -241,7 +243,6 @@ type OpenStackMachineStatus struct { // +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api,shortName=osm // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackMachine belongs" -// +kubebuilder:printcolumn:name="InstanceState",type="string",JSONPath=".status.instanceState",description="OpenStack instance state" // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Machine ready status" // +kubebuilder:printcolumn:name="ProviderID",type="string",JSONPath=".spec.providerID",description="OpenStack instance ID" // +kubebuilder:printcolumn:name="Machine",type="string",JSONPath=".metadata.ownerReferences[?(@.kind==\"Machine\")].name",description="Machine object which owns with this OpenStackMachine" diff --git a/cmd/models-schema/zz_generated.openapi.go b/cmd/models-schema/zz_generated.openapi.go index 74c0415d8e..4a577852c7 100644 --- a/cmd/models-schema/zz_generated.openapi.go +++ b/cmd/models-schema/zz_generated.openapi.go @@ -21537,7 +21537,7 @@ func schema_sigsk8sio_cluster_api_provider_openstack_api_v1beta1_OpenStackMachin }, "instanceState": { SchemaProps: spec.SchemaProps{ - Description: "InstanceState is the state of the OpenStack instance for this machine.", + Description: "InstanceState is the state of the OpenStack instance for this machine. This field is not set anymore by the OpenStackMachine controller. Instead, it's set by the OpenStackServer controller.", Type: []string{"string"}, Format: "", }, diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml index f8cb20e56a..96975431f7 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml @@ -547,10 +547,6 @@ spec: jsonPath: .metadata.labels.cluster\.x-k8s\.io/cluster-name name: Cluster type: string - - description: OpenStack instance state - jsonPath: .status.instanceState - name: InstanceState - type: string - description: Machine ready status jsonPath: .status.ready name: Ready @@ -1555,8 +1551,10 @@ spec: description: InstanceID is the OpenStack instance ID for this machine. type: string instanceState: - description: InstanceState is the state of the OpenStack instance - for this machine. + description: |- + InstanceState is the state of the OpenStack instance for this machine. + This field is not set anymore by the OpenStackMachine controller. + Instead, it's set by the OpenStackServer controller. type: string ready: description: Ready is true when the provider resource is ready. diff --git a/docs/book/src/api/v1beta1/api.md b/docs/book/src/api/v1beta1/api.md index fa23c4cd24..00e763491e 100644 --- a/docs/book/src/api/v1beta1/api.md +++ b/docs/book/src/api/v1beta1/api.md @@ -3548,7 +3548,9 @@ InstanceState
InstanceState is the state of the OpenStack instance for this machine.
+InstanceState is the state of the OpenStack instance for this machine. +This field is not set anymore by the OpenStackMachine controller. +Instead, it’s set by the OpenStackServer controller.