update printcolumn

Author: sp-yduck

api/v1beta1/proxmoxcluster_types.go

@@ -59,8 +59,10 @@ type ProxmoxClusterStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="ControlPlaneEndpoint",type=string,JSONPath=`.spec.controlPlaneEndpoint.host`
-// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.ready`
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Cluster infrastructure is ready for ProxmoxMachine"
+// +kubebuilder:printcolumn:name="Proxmox-Server",type="string",JSONPath=".spec.serverRef.endpoint",description="Server is the address of the Proxmox API endpoint."
+// +kubebuilder:printcolumn:name="ControlPlane",type="string",JSONPath=".spec.controlPlaneEndpoint.host",description="kube-apiserver Endpoint"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of Machine"
 
 // ProxmoxCluster is the Schema for the proxmoxclusters API
 type ProxmoxCluster struct {

api/v1beta1/proxmoxmachine_types.go

@@ -78,7 +78,7 @@ type ProxmoxMachineStatus struct {
 	// FailureMessage
 	FailureMessage *string `json:"failureMessage,omitempty"`
 
-	// Addresses contains the AWS instance associated addresses.
+	// Addresses
 	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
 
 	// Conditions
@@ -91,9 +91,12 @@ type ProxmoxMachineStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="Addresses",type=string,JSONPath=`.status.addresses`
+// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this VSphereMachine belongs"
+// +kubebuilder:printcolumn:name="Machine",type="string",JSONPath=".metadata.ownerReferences[?(@.kind==\"Machine\")].name",description="Machine object which owns with this ProxmoxMachine",priority=1
+// +kubebuilder:printcolumn:name="vmid",type=string,JSONPath=`.spec.vmID`,priority=1
 // +kubebuilder:printcolumn:name="ProviderID",type=string,JSONPath=`.spec.providerID`
-// +kubebuilder:printcolumn:name="InstanceStatus",type=string,JSONPath=`.status.instanceStatus`
+// +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.instanceStatus`
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of Machine"
 
 // ProxmoxMachine is the Schema for the proxmoxmachines API
 type ProxmoxMachine struct {

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxclusters.yaml

@@ -16,12 +16,22 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .spec.controlPlaneEndpoint.host
-      name: ControlPlaneEndpoint
-      type: string
-    - jsonPath: .status.ready
+    - description: Cluster infrastructure is ready for ProxmoxMachine
+      jsonPath: .status.ready
       name: Ready
       type: string
+    - description: Server is the address of the Proxmox API endpoint.
+      jsonPath: .spec.serverRef.endpoint
+      name: Proxmox-Server
+      type: string
+    - description: kube-apiserver Endpoint
+      jsonPath: .spec.controlPlaneEndpoint.host
+      name: ControlPlane
+      type: string
+    - description: Time duration since creation of Machine
+      jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
     name: v1beta1
     schema:
       openAPIV3Schema:

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachines.yaml

@@ -16,15 +16,29 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .status.addresses
-      name: Addresses
+    - description: Cluster to which this VSphereMachine belongs
+      jsonPath: .metadata.labels.cluster\.x-k8s\.io/cluster-name
+      name: Cluster
+      type: string
+    - description: Machine object which owns with this ProxmoxMachine
+      jsonPath: .metadata.ownerReferences[?(@.kind=="Machine")].name
+      name: Machine
+      priority: 1
+      type: string
+    - jsonPath: .spec.vmID
+      name: vmid
+      priority: 1
       type: string
     - jsonPath: .spec.providerID
       name: ProviderID
       type: string
     - jsonPath: .status.instanceStatus
-      name: InstanceStatus
+      name: Status
       type: string
+    - description: Time duration since creation of Machine
+      jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
     name: v1beta1
     schema:
       openAPIV3Schema:
@@ -135,7 +149,7 @@ spec:
             description: ProxmoxMachineStatus defines the observed state of ProxmoxMachine
             properties:
               addresses:
-                description: Addresses contains the AWS instance associated addresses.
+                description: Addresses
                 items:
                   description: MachineAddress contains information for the node's
                     address.