diff --git a/app/caps-controller-manager/api/v1alpha3/metalcluster_types.go b/app/caps-controller-manager/api/v1alpha3/metalcluster_types.go index 46b9b1982..e91b11d81 100644 --- a/app/caps-controller-manager/api/v1alpha3/metalcluster_types.go +++ b/app/caps-controller-manager/api/v1alpha3/metalcluster_types.go @@ -31,6 +31,7 @@ type MetalClusterStatus struct { // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this MetalCluster belongs" // +kubebuilder:printcolumn:name="Ready",type="boolean",JSONPath=".status.ready" // +kubebuilder:printcolumn:name="Endpoint",type="string",priority=1,JSONPath=".spec.controlPlaneEndpoint.host",description="Control Plane Endpoint" +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of this resource" // +kubebuilder:storageversion // +kubebuilder:subresource:status diff --git a/app/caps-controller-manager/api/v1alpha3/metalmachine_types.go b/app/caps-controller-manager/api/v1alpha3/metalmachine_types.go index 1380fdac7..2bab4980c 100644 --- a/app/caps-controller-manager/api/v1alpha3/metalmachine_types.go +++ b/app/caps-controller-manager/api/v1alpha3/metalmachine_types.go @@ -76,6 +76,7 @@ type MetalMachineStatus struct { // +kubebuilder:printcolumn:name="Cluster",type="string",priority=1,JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this MetalMachine belongs" // +kubebuilder:printcolumn:name="Machine",type="string",priority=1,JSONPath=".metadata.ownerReferences[?(@.kind==\"Machine\")].name",description="Machine object to which this MetalMachine belongs" // +kubebuilder:printcolumn:name="Server",type="string",priority=1,JSONPath=".spec.serverRef.name",description="Server ID" +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of this resource" // +kubebuilder:storageversion // +kubebuilder:subresource:status diff --git a/app/caps-controller-manager/api/v1alpha3/serverbinding_types.go b/app/caps-controller-manager/api/v1alpha3/serverbinding_types.go index 57d881551..f32596828 100644 --- a/app/caps-controller-manager/api/v1alpha3/serverbinding_types.go +++ b/app/caps-controller-manager/api/v1alpha3/serverbinding_types.go @@ -44,6 +44,7 @@ type ServerBindingState struct { // +kubebuilder:printcolumn:name="ServerClass",type="string",priority=1,JSONPath=".spec.serverClassRef.name",description="Server Class" // +kubebuilder:printcolumn:name="MetalMachine",type="string",priority=1,JSONPath=".spec.metalMachineRef.name",description="Metal Machine" // +kubebuilder:printcolumn:name="Cluster",type="string",priority=1,JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this ServerBinding belongs" +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of this resource" // +kubebuilder:storageversion // +kubebuilder:subresource:status diff --git a/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml index 0f7c22baa..c88ce45b9 100644 --- a/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml +++ b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml @@ -95,6 +95,10 @@ spec: name: Endpoint priority: 1 type: string + - description: The age of this resource + jsonPath: .metadata.creationTimestamp + name: Age + type: date name: v1alpha3 schema: openAPIV3Schema: diff --git a/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml index 17fb2ef44..2646fb15f 100644 --- a/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml +++ b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml @@ -165,6 +165,10 @@ spec: name: Server priority: 1 type: string + - description: The age of this resource + jsonPath: .metadata.creationTimestamp + name: Age + type: date name: v1alpha3 schema: openAPIV3Schema: diff --git a/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml index e8e9c5a53..95b360d9e 100644 --- a/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml +++ b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml @@ -41,6 +41,10 @@ spec: name: Cluster priority: 1 type: string + - description: The age of this resource + jsonPath: .metadata.creationTimestamp + name: Age + type: date name: v1alpha3 schema: openAPIV3Schema: diff --git a/app/sidero-controller-manager/api/v1alpha1/environment_types.go b/app/sidero-controller-manager/api/v1alpha1/environment_types.go index 9ea5b951e..26b554139 100644 --- a/app/sidero-controller-manager/api/v1alpha1/environment_types.go +++ b/app/sidero-controller-manager/api/v1alpha1/environment_types.go @@ -53,6 +53,7 @@ type EnvironmentStatus struct { // +kubebuilder:printcolumn:name="Kernel",type="string",JSONPath=".spec.kernel.url",description="the kernel for the environment" // +kubebuilder:printcolumn:name="Initrd",type="string",JSONPath=".spec.initrd.url",description="the initrd for the environment" // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description="indicates the readiness of the environment" +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of this resource" // Environment is the Schema for the environments API. type Environment struct { diff --git a/app/sidero-controller-manager/api/v1alpha1/server_types.go b/app/sidero-controller-manager/api/v1alpha1/server_types.go index a019a6997..6e77d7c96 100644 --- a/app/sidero-controller-manager/api/v1alpha1/server_types.go +++ b/app/sidero-controller-manager/api/v1alpha1/server_types.go @@ -192,11 +192,13 @@ type ServerStatus struct { // +kubebuilder:subresource:status // +kubebuilder:resource:scope=Cluster // +kubebuilder:printcolumn:name="Hostname",type="string",JSONPath=".spec.hostname",description="server hostname" +// +kubebuilder:printcolumn:name="BMC IP",type="string",priority=1,JSONPath=".spec.bmc.endpoint",description="BMC IP" // +kubebuilder:printcolumn:name="Accepted",type="boolean",JSONPath=".spec.accepted",description="indicates if the server is accepted" // +kubebuilder:printcolumn:name="Cordoned",type="boolean",JSONPath=".spec.cordoned",description="indicates if the server is cordoned" // +kubebuilder:printcolumn:name="Allocated",type="boolean",JSONPath=".status.inUse",description="indicates that the server has been allocated" // +kubebuilder:printcolumn:name="Clean",type="boolean",JSONPath=".status.isClean",description="indicates if the server is clean or not" // +kubebuilder:printcolumn:name="Power",type="string",JSONPath=".status.power",description="display the current power status" +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of this resource" // Server is the Schema for the servers API. type Server struct { diff --git a/app/sidero-controller-manager/api/v1alpha1/serverclass_types.go b/app/sidero-controller-manager/api/v1alpha1/serverclass_types.go index 22a61b253..522ee3a63 100644 --- a/app/sidero-controller-manager/api/v1alpha1/serverclass_types.go +++ b/app/sidero-controller-manager/api/v1alpha1/serverclass_types.go @@ -50,6 +50,7 @@ type ServerClassStatus struct { // +kubebuilder:resource:scope=Cluster // +kubebuilder:printcolumn:name="Available",type="string",JSONPath=".status.serversAvailable",description="the number of available servers" // +kubebuilder:printcolumn:name="In Use",type="string",JSONPath=".status.serversInUse",description="the number of servers in use" +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of this resource" // ServerClass is the Schema for the serverclasses API. type ServerClass struct { diff --git a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml index 8b76aa32f..654d12257 100644 --- a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml +++ b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml @@ -29,6 +29,10 @@ spec: jsonPath: .status.conditions[?(@.type=="Ready")].status name: Ready type: string + - description: The age of this resource + jsonPath: .metadata.creationTimestamp + name: Age + type: date name: v1alpha1 schema: openAPIV3Schema: diff --git a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml index 61544d8d1..98b971c52 100644 --- a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml +++ b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml @@ -25,6 +25,10 @@ spec: jsonPath: .status.serversInUse name: In Use type: string + - description: The age of this resource + jsonPath: .metadata.creationTimestamp + name: Age + type: date name: v1alpha1 schema: openAPIV3Schema: diff --git a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml index f5788f7a4..7f6f550a0 100644 --- a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml +++ b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml @@ -21,6 +21,11 @@ spec: jsonPath: .spec.hostname name: Hostname type: string + - description: BMC IP + jsonPath: .spec.bmc.endpoint + name: BMC IP + priority: 1 + type: string - description: indicates if the server is accepted jsonPath: .spec.accepted name: Accepted @@ -41,6 +46,10 @@ spec: jsonPath: .status.power name: Power type: string + - description: The age of this resource + jsonPath: .metadata.creationTimestamp + name: Age + type: date name: v1alpha1 schema: openAPIV3Schema: