Merge pull request #543 from CecileRobertMichon/print-columns-ux

✨ Add printer columns to AzureMachine and AzureCluster

Author: k8s-ci-robot

api/v1alpha3/azurecluster_types.go

@@ -58,6 +58,11 @@ type AzureClusterStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this AzureCluster belongs"
+// +kubebuilder:printcolumn:name="Ready",type="boolean",JSONPath=".status.ready"
+// +kubebuilder:printcolumn:name="Resource Group",type="string",priority=1,JSONPath=".spec.resourceGroup"
+// +kubebuilder:printcolumn:name="Location",type="string",priority=1,JSONPath=".spec.location"
+// +kubebuilder:printcolumn:name="Endpoint",type="string",priority=1,JSONPath=".spec.controlPlaneEndpoint.host",description="Control Plane Endpoint"
 // +kubebuilder:resource:path=azureclusters,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status

api/v1alpha3/azuremachine_types.go

@@ -114,6 +114,12 @@ type AzureMachineStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="AzureMachine ready status"
+// +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.vmState",description="Azure VM provisioning state"
+// +kubebuilder:printcolumn:name="Cluster",type="string",priority=1,JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this AzureMachine belongs"
+// +kubebuilder:printcolumn:name="Machine",type="string",priority=1,JSONPath=".metadata.ownerReferences[?(@.kind==\"Machine\")].name",description="Machine object to which this AzureMachine belongs"
+// +kubebuilder:printcolumn:name="VM ID",type="string",priority=1,JSONPath=".spec.providerID",description="Azure VM ID"
+// +kubebuilder:printcolumn:name="VM Size",type="string",priority=1,JSONPath=".spec.vmSize",description="Azure VM Size"
 // +kubebuilder:resource:path=azuremachines,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status

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

@@ -392,7 +392,28 @@ spec:
     storage: false
     subresources:
       status: {}
-  - name: v1alpha3
+  - additionalPrinterColumns:
+    - description: Cluster to which this AzureCluster belongs
+      jsonPath: .metadata.labels.cluster\.x-k8s\.io/cluster-name
+      name: Cluster
+      type: string
+    - jsonPath: .status.ready
+      name: Ready
+      type: boolean
+    - jsonPath: .spec.resourceGroup
+      name: Resource Group
+      priority: 1
+      type: string
+    - jsonPath: .spec.location
+      name: Location
+      priority: 1
+      type: string
+    - description: Control Plane Endpoint
+      jsonPath: .spec.controlPlaneEndpoint.host
+      name: Endpoint
+      priority: 1
+      type: string
+    name: v1alpha3
     schema:
       openAPIV3Schema:
         description: AzureCluster is the Schema for the azureclusters API

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

@@ -184,7 +184,36 @@ spec:
     storage: false
     subresources:
       status: {}
-  - name: v1alpha3
+  - additionalPrinterColumns:
+    - description: AzureMachine ready status
+      jsonPath: .status.ready
+      name: Ready
+      type: string
+    - description: Azure VM provisioning state
+      jsonPath: .status.vmState
+      name: State
+      type: string
+    - description: Cluster to which this AzureMachine belongs
+      jsonPath: .metadata.labels.cluster\.x-k8s\.io/cluster-name
+      name: Cluster
+      priority: 1
+      type: string
+    - description: Machine object to which this AzureMachine belongs
+      jsonPath: .metadata.ownerReferences[?(@.kind=="Machine")].name
+      name: Machine
+      priority: 1
+      type: string
+    - description: Azure VM ID
+      jsonPath: .spec.providerID
+      name: VM ID
+      priority: 1
+      type: string
+    - description: Azure VM Size
+      jsonPath: .spec.vmSize
+      name: VM Size
+      priority: 1
+      type: string
+    name: v1alpha3
     schema:
       openAPIV3Schema:
         description: AzureMachine is the Schema for the azuremachines API