Merge pull request #1277 from randomvariable/kubectl-get-awsmachine-info

✨ Add printer columns

Author: k8s-ci-robot

api/v1alpha3/awscluster_types.go

@@ -68,6 +68,11 @@ type AWSClusterStatus struct {
 // +kubebuilder:resource:path=awsclusters,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this AWSCluster belongs"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Cluster infrastructure is ready for EC2 instances"
+// +kubebuilder:printcolumn:name="VPC",type="string",JSONPath=".spec.networkSpec.vpc.id",description="AWS VPC the cluster is using"
+// +kubebuilder:printcolumn:name="Endpoint",type="string",JSONPath=".status.apiEndpoints[0]",description="API Endpoint",priority=1
+// +kubebuilder:printcolumn:name="Bastion IP",type="string",JSONPath=".status.bastion.publicIp",description="Bastion IP address for breakglass access"
 
 // AWSCluster is the Schema for the awsclusters API
 type AWSCluster struct {

api/v1alpha3/awsmachine_types.go

@@ -146,6 +146,11 @@ type AWSMachineStatus struct {
 // +kubebuilder:resource:path=awsmachines,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this AWSMachine belongs"
+// +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.instanceState",description="EC2 instance state"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Machine ready status"
+// +kubebuilder:printcolumn:name="InstanceID",type="string",JSONPath=".spec.providerID",description="EC2 instance ID"
+// +kubebuilder:printcolumn:name="Machine",type="string",JSONPath=".metadata.ownerReferences[?(@.kind==\"Machine\")].name",description="Machine object which owns with this AWSMachine"
 
 // AWSMachine is the Schema for the awsmachines API
 type AWSMachine struct {

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

@@ -396,7 +396,29 @@ spec:
   - name: v1alpha2
     served: true
     storage: false
-  - name: v1alpha3
+  - additionalPrinterColumns:
+    - JSONPath: .metadata.labels.cluster\.x-k8s\.io/cluster-name
+      description: Cluster to which this AWSCluster belongs
+      name: Cluster
+      type: string
+    - JSONPath: .status.ready
+      description: Cluster infrastructure is ready for EC2 instances
+      name: Ready
+      type: string
+    - JSONPath: .spec.networkSpec.vpc.id
+      description: AWS VPC the cluster is using
+      name: VPC
+      type: string
+    - JSONPath: .status.apiEndpoints[0]
+      description: API Endpoint
+      name: Endpoint
+      priority: 1
+      type: string
+    - JSONPath: .status.bastion.publicIp
+      description: Bastion IP address for breakglass access
+      name: Bastion IP
+      type: string
+    name: v1alpha3
     served: true
     storage: true
 status:

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

@@ -254,7 +254,28 @@ spec:
   - name: v1alpha2
     served: true
     storage: false
-  - name: v1alpha3
+  - additionalPrinterColumns:
+    - JSONPath: .metadata.labels.cluster\.x-k8s\.io/cluster-name
+      description: Cluster to which this AWSMachine belongs
+      name: Cluster
+      type: string
+    - JSONPath: .status.instanceState
+      description: EC2 instance state
+      name: State
+      type: string
+    - JSONPath: .status.ready
+      description: Machine ready status
+      name: Ready
+      type: string
+    - JSONPath: .spec.providerID
+      description: EC2 instance ID
+      name: InstanceID
+      type: string
+    - JSONPath: .metadata.ownerReferences[?(@.kind=="Machine")].name
+      description: Machine object which owns with this AWSMachine
+      name: Machine
+      type: string
+    name: v1alpha3
     served: true
     storage: true
 status: