diff --git a/kwok/charts/crds/karpenter.sh_nodeclaims.yaml b/kwok/charts/crds/karpenter.sh_nodeclaims.yaml index 83b294f119..628e6b4d1f 100644 --- a/kwok/charts/crds/karpenter.sh_nodeclaims.yaml +++ b/kwok/charts/crds/karpenter.sh_nodeclaims.yaml @@ -20,6 +20,9 @@ spec: - jsonPath: .metadata.labels.node\.kubernetes\.io/instance-type name: Type type: string + - jsonPath: .metadata.labels.karpenter\.sh/capacity-type + name: Capacity + type: string - jsonPath: .metadata.labels.topology\.kubernetes\.io/zone name: Zone type: string @@ -32,8 +35,8 @@ spec: - jsonPath: .metadata.creationTimestamp name: Age type: date - - jsonPath: .metadata.labels.karpenter\.sh/capacity-type - name: Capacity + - jsonPath: .status.providerID + name: ID priority: 1 type: string - jsonPath: .metadata.labels.karpenter\.sh/nodepool diff --git a/pkg/apis/crds/karpenter.sh_nodeclaims.yaml b/pkg/apis/crds/karpenter.sh_nodeclaims.yaml index 615402f1d6..c7f315a339 100644 --- a/pkg/apis/crds/karpenter.sh_nodeclaims.yaml +++ b/pkg/apis/crds/karpenter.sh_nodeclaims.yaml @@ -20,6 +20,9 @@ spec: - jsonPath: .metadata.labels.node\.kubernetes\.io/instance-type name: Type type: string + - jsonPath: .metadata.labels.karpenter\.sh/capacity-type + name: Capacity + type: string - jsonPath: .metadata.labels.topology\.kubernetes\.io/zone name: Zone type: string @@ -32,8 +35,8 @@ spec: - jsonPath: .metadata.creationTimestamp name: Age type: date - - jsonPath: .metadata.labels.karpenter\.sh/capacity-type - name: Capacity + - jsonPath: .status.providerID + name: ID priority: 1 type: string - jsonPath: .metadata.labels.karpenter\.sh/nodepool diff --git a/pkg/apis/v1/nodeclaim.go b/pkg/apis/v1/nodeclaim.go index d1d85f51c0..6d7c64e57b 100644 --- a/pkg/apis/v1/nodeclaim.go +++ b/pkg/apis/v1/nodeclaim.go @@ -164,11 +164,12 @@ type Provider = runtime.RawExtension // +kubebuilder:resource:path=nodeclaims,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="Capacity",type="string",JSONPath=".metadata.labels.karpenter\\.sh/capacity-type",description="" // +kubebuilder:printcolumn:name="Zone",type="string",JSONPath=".metadata.labels.topology\\.kubernetes\\.io/zone",description="" // +kubebuilder:printcolumn:name="Node",type="string",JSONPath=".status.nodeName",description="" // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description="" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="" -// +kubebuilder:printcolumn:name="Capacity",type="string",JSONPath=".metadata.labels.karpenter\\.sh/capacity-type",priority=1,description="" +// +kubebuilder:printcolumn:name="ID",type="string",JSONPath=".status.providerID",priority=1,description="" // +kubebuilder:printcolumn:name="NodePool",type="string",JSONPath=".metadata.labels.karpenter\\.sh/nodepool",priority=1,description="" // +kubebuilder:printcolumn:name="NodeClass",type="string",JSONPath=".spec.nodeClassRef.name",priority=1,description="" type NodeClaim struct {