From 93fcb98c31c75bc3152ad6b0d73876c15bfc2fb0 Mon Sep 17 00:00:00 2001 From: Brian Lockwood Date: Fri, 16 Jan 2026 15:44:25 -0800 Subject: [PATCH] feat: add new printer columns --- chart/templates/skyhook-crd.yaml | 6 ++++++ operator/api/v1alpha1/skyhook_types.go | 4 +++- operator/api/v1alpha1/zz_generated.deepcopy.go | 2 +- .../crd/bases/skyhook.nvidia.com_deploymentpolicies.yaml | 2 +- .../config/crd/bases/skyhook.nvidia.com_skyhooks.yaml | 8 +++++++- operator/config/rbac/role.yaml | 2 +- operator/config/webhook/manifests.yaml | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/chart/templates/skyhook-crd.yaml b/chart/templates/skyhook-crd.yaml index 3f4fe002..5ad947f3 100644 --- a/chart/templates/skyhook-crd.yaml +++ b/chart/templates/skyhook-crd.yaml @@ -29,6 +29,9 @@ spec: - jsonPath: .status.status name: Status type: string + - jsonPath: .spec.priority + name: Priority + type: integer - jsonPath: .metadata.creationTimestamp name: Age type: date @@ -41,6 +44,9 @@ spec: - jsonPath: .status.packageList name: Packages type: string + - jsonPath: .spec.deploymentPolicy + name: Policy + type: string name: v1alpha1 schema: openAPIV3Schema: diff --git a/operator/api/v1alpha1/skyhook_types.go b/operator/api/v1alpha1/skyhook_types.go index 2bc219f2..319050ef 100644 --- a/operator/api/v1alpha1/skyhook_types.go +++ b/operator/api/v1alpha1/skyhook_types.go @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * SPDX-License-Identifier: Apache-2.0 * * @@ -711,10 +711,12 @@ func StateToStatus(s State) Status { //+kubebuilder:object:root=true //+kubebuilder:printcolumn:name="Status",type=string,JSONPath=".status.status" +//+kubebuilder:printcolumn:name="Priority",type=integer,JSONPath=".spec.priority" //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp" //+kubebuilder:printcolumn:name="Nodes In-Progress",type=integer,JSONPath=".status.nodesInProgress" //+kubebuilder:printcolumn:name="Complete Nodes",type=string,JSONPath=".status.completeNodes" //+kubebuilder:printcolumn:name="Packages",type=string,JSONPath=".status.packageList" +//+kubebuilder:printcolumn:name="Policy",type=string,JSONPath=".spec.deploymentPolicy" //+kubebuilder:subresource:status //+kubebuilder:resource:scope=Cluster diff --git a/operator/api/v1alpha1/zz_generated.deepcopy.go b/operator/api/v1alpha1/zz_generated.deepcopy.go index 63e6652d..0f837e2c 100644 --- a/operator/api/v1alpha1/zz_generated.deepcopy.go +++ b/operator/api/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * SPDX-License-Identifier: Apache-2.0 * * diff --git a/operator/config/crd/bases/skyhook.nvidia.com_deploymentpolicies.yaml b/operator/config/crd/bases/skyhook.nvidia.com_deploymentpolicies.yaml index c8a7688e..e1c452f4 100644 --- a/operator/config/crd/bases/skyhook.nvidia.com_deploymentpolicies.yaml +++ b/operator/config/crd/bases/skyhook.nvidia.com_deploymentpolicies.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 # # diff --git a/operator/config/crd/bases/skyhook.nvidia.com_skyhooks.yaml b/operator/config/crd/bases/skyhook.nvidia.com_skyhooks.yaml index bb13a401..82de8a56 100644 --- a/operator/config/crd/bases/skyhook.nvidia.com_skyhooks.yaml +++ b/operator/config/crd/bases/skyhook.nvidia.com_skyhooks.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 # # @@ -34,6 +34,9 @@ spec: - jsonPath: .status.status name: Status type: string + - jsonPath: .spec.priority + name: Priority + type: integer - jsonPath: .metadata.creationTimestamp name: Age type: date @@ -46,6 +49,9 @@ spec: - jsonPath: .status.packageList name: Packages type: string + - jsonPath: .spec.deploymentPolicy + name: Policy + type: string name: v1alpha1 schema: openAPIV3Schema: diff --git a/operator/config/rbac/role.yaml b/operator/config/rbac/role.yaml index a3055551..f1a8af05 100644 --- a/operator/config/rbac/role.yaml +++ b/operator/config/rbac/role.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 # # diff --git a/operator/config/webhook/manifests.yaml b/operator/config/webhook/manifests.yaml index 5bb67d66..dc15056c 100644 --- a/operator/config/webhook/manifests.yaml +++ b/operator/config/webhook/manifests.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 # #