Merge pull request #360 from ingvagabund/get-machine-additional-columns-from-annotations-and-labels

Get values for CRD's additionalPrinterColumns from annotations and labels instead of machine provider config

Author: openshift-merge-robot

Gopkg.lock

@@ -13,6 +13,10 @@ required = [
   "sigs.k8s.io/controller-tools/cmd/controller-gen", # for crd/rbac generation
 ]
 
+[[override]]
+  name = "github.com/openshift/cluster-api"
+  branch = "openshift-4.2-cluster-api-0.1.0"
+
 [[override]]
   name = "k8s.io/utils"
 

Gopkg.toml

@@ -7,30 +7,36 @@ metadata:
   name: machines.machine.openshift.io
 spec:
   additionalPrinterColumns:
-  - JSONPath: .status.providerStatus.instanceId
-    description: Instance ID of machine created in AWS
-    name: Instance
-    type: string
-  - JSONPath: .status.providerStatus.instanceState
-    description: State of the AWS instance
+  - JSONPath: .metadata.annotations['machine\.openshift\.io/instance-state']
+    description: State of instance
     name: State
     type: string
-  - JSONPath: .spec.providerSpec.value.instanceType
+  - JSONPath: .metadata.labels['machine\.openshift\.io/instance-type']
     description: Type of instance
     name: Type
     type: string
-  - JSONPath: .spec.providerSpec.value.placement.region
+  - JSONPath: .metadata.labels['machine\.openshift\.io/region']
     description: Region associated with machine
     name: Region
     type: string
-  - JSONPath: .spec.providerSpec.value.placement.availabilityZone
+  - JSONPath: .metadata.labels['machine\.openshift\.io/zone']
     description: Zone associated with machine
     name: Zone
     type: string
   - JSONPath: .metadata.creationTimestamp
     description: Machine age
     name: Age
     type: date
+  - JSONPath: .status.nodeRef.name
+    description: Node associated with machine
+    name: Node
+    priority: 1
+    type: string
+  - JSONPath: .spec.providerID
+    description: Provider ID of machine created in cloud provider
+    name: ProviderID
+    priority: 1
+    type: string
   group: machine.openshift.io
   names:
     kind: Machine