From 882f2aa7205ad0fa15023cb8786ff770c61c64a3 Mon Sep 17 00:00:00 2001
From: Jonathan Innis <joinnis@amazon.com>
Date: Thu, 30 Mar 2023 15:31:40 -0700
Subject: [PATCH] Add JSON printer column for zone

---
 pkg/apis/crds/karpenter.sh_machines.yaml | 3 +++
 pkg/apis/v1alpha5/machine.go             | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkg/apis/crds/karpenter.sh_machines.yaml b/pkg/apis/crds/karpenter.sh_machines.yaml
index 7e256ed049..5eabf22c13 100644
--- a/pkg/apis/crds/karpenter.sh_machines.yaml
+++ b/pkg/apis/crds/karpenter.sh_machines.yaml
@@ -21,6 +21,9 @@ spec:
     - jsonPath: .metadata.labels.node\.kubernetes\.io/instance-type
       name: Type
       type: string
+    - jsonPath: .metadata.labels.topology\.kubernetes\.io/zone
+      name: Zone
+      type: string
     - jsonPath: .metadata.labels.karpenter\.sh/capacity-type
       name: Capacity
       type: string
diff --git a/pkg/apis/v1alpha5/machine.go b/pkg/apis/v1alpha5/machine.go
index e3c2eded92..a03ded714b 100644
--- a/pkg/apis/v1alpha5/machine.go
+++ b/pkg/apis/v1alpha5/machine.go
@@ -130,6 +130,7 @@ type ResourceRequirements struct {
 // +kubebuilder:resource:path=machines,scope=Cluster,categories=karpenter
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".metadata.labels.node\\.kubernetes\\.io/instance-type",description=""
+// +kubebuilder:printcolumn:name="Zone",type="string",JSONPath=".metadata.labels.topology\\.kubernetes\\.io/zone",description=""
 // +kubebuilder:printcolumn:name="Capacity",type="string",JSONPath=".metadata.labels.karpenter\\.sh/capacity-type",description=""
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""