Fix linter issues

shengnuo · shengnuo · commit c6b9347e4707 · 2025-08-12T20:11:58.000-04:00
Signed-off-by: Sheng Lin &lt;shelin@nvidia.com&gt;
diff --git a/api/apps/v1alpha1/common_types.go b/api/apps/v1alpha1/common_types.go
@@ -122,7 +122,7 @@ type Ingress struct {
 	Spec        networkingv1.IngressSpec `json:"spec,omitempty"`
 }
 
-// HTTPRoute defines attributes to HTTPRoute in Gateway API
+// HTTPRoute defines attributes to HTTPRoute in Gateway API.
 type HTTPRoute struct {
 	Enabled     *bool             `json:"enabled,omitempty"`
 	Annotations map[string]string `json:"annotations,omitempty"`
diff --git a/cmd/main.go b/cmd/main.go
@@ -39,14 +39,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	lws "sigs.k8s.io/lws/api/leaderworkerset/v1"
 
 	appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1"
 	"github.com/NVIDIA/k8s-nim-operator/internal/conditions"
 	"github.com/NVIDIA/k8s-nim-operator/internal/controller"
 	"github.com/NVIDIA/k8s-nim-operator/internal/render"
 	webhookappsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/internal/webhook/apps/v1alpha1"
-	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -61,7 +61,7 @@ func init() {
 	utilruntime.Must(monitoring.AddToScheme(scheme))
 	utilruntime.Must(lws.AddToScheme(scheme))
 	utilruntime.Must(kservev1beta1.AddToScheme(scheme))
-	utilruntime.Must(gatewayv1.AddToScheme(scheme))
+	utilruntime.Must(gatewayv1.Install(scheme))
 	// +kubebuilder:scaffold:scheme
 }
 
diff --git a/internal/controller/nemo_datastore_controller.go b/internal/controller/nemo_datastore_controller.go
@@ -251,7 +251,7 @@ func (r *NemoDatastoreReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					if ok {
 
 						// Handle case where object is marked for deletion
-						if !newNemoDatastore.ObjectMeta.DeletionTimestamp.IsZero() {
+						if !newNemoDatastore.DeletionTimestamp.IsZero() {
 							return true
 						}
 
diff --git a/internal/controller/nemo_datastore_controller_test.go b/internal/controller/nemo_datastore_controller_test.go
@@ -93,7 +93,7 @@ var _ = Describe("NemoDatastore Controller", func() {
 		Expect(networkingv1.AddToScheme(scheme)).To(Succeed())
 		Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
 		Expect(appsv1.AddToScheme(scheme)).To(Succeed())
-		Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
+		Expect(gatewayv1.Install(scheme)).To(Succeed())
 
 		manifestsDir, err := filepath.Abs("../../manifests")
 		Expect(err).ToNot(HaveOccurred())
diff --git a/internal/controller/nemo_entitystore_controller.go b/internal/controller/nemo_entitystore_controller.go
@@ -249,7 +249,7 @@ func (r *NemoEntitystoreReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					newNemoEntitystore, ok := e.ObjectNew.(*appsv1alpha1.NemoEntitystore)
 					if ok {
 						// Handle case where object is marked for deletion
-						if !newNemoEntitystore.ObjectMeta.DeletionTimestamp.IsZero() {
+						if !newNemoEntitystore.DeletionTimestamp.IsZero() {
 							return true
 						}
 
diff --git a/internal/controller/nemo_entitystore_controller_test.go b/internal/controller/nemo_entitystore_controller_test.go
@@ -107,7 +107,7 @@ var _ = Describe("NemoEntitystore Controller", func() {
 		Expect(corev1.AddToScheme(scheme)).To(Succeed())
 		Expect(networkingv1.AddToScheme(scheme)).To(Succeed())
 		Expect(rbacv1.AddToScheme(scheme)).To(Succeed())
-		Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
+		Expect(gatewayv1.Install(scheme)).To(Succeed())
 
 		client = fake.NewClientBuilder().WithScheme(scheme).
 			WithStatusSubresource(&appsv1alpha1.NemoEntitystore{}).
diff --git a/internal/controller/nemo_evaluator_controller.go b/internal/controller/nemo_evaluator_controller.go
@@ -250,7 +250,7 @@ func (r *NemoEvaluatorReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					newNemoEvaluator, ok := e.ObjectNew.(*appsv1alpha1.NemoEvaluator)
 					if ok {
 						// Handle case where object is marked for deletion
-						if !newNemoEvaluator.ObjectMeta.DeletionTimestamp.IsZero() {
+						if !newNemoEvaluator.DeletionTimestamp.IsZero() {
 							return true
 						}
 
diff --git a/internal/controller/nemo_evaluator_controller_test.go b/internal/controller/nemo_evaluator_controller_test.go
@@ -69,7 +69,7 @@ var _ = Describe("NemoEvaluator Controller", func() {
 		Expect(corev1.AddToScheme(scheme)).To(Succeed())
 		Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
 		Expect(batchv1.AddToScheme(scheme)).To(Succeed())
-		Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
+		Expect(gatewayv1.Install(scheme)).To(Succeed())
 
 		client = fake.NewClientBuilder().WithScheme(scheme).
 			WithStatusSubresource(&appsv1alpha1.NemoEvaluator{}).
diff --git a/internal/controller/nemo_guardrail_controller.go b/internal/controller/nemo_guardrail_controller.go
@@ -250,7 +250,7 @@ func (r *NemoGuardrailReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					newNemoGuardrail, ok := e.ObjectNew.(*appsv1alpha1.NemoGuardrail)
 					if ok {
 						// Handle case where object is marked for deletion
-						if !newNemoGuardrail.ObjectMeta.DeletionTimestamp.IsZero() {
+						if !newNemoGuardrail.DeletionTimestamp.IsZero() {
 							return true
 						}
 
diff --git a/internal/controller/nemocustomizer_controller.go b/internal/controller/nemocustomizer_controller.go
@@ -265,7 +265,7 @@ func (r *NemoCustomizerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					newNemoCustomizer, ok := e.ObjectNew.(*appsv1alpha1.NemoCustomizer)
 					if ok {
 						// Handle case where object is marked for deletion
-						if !newNemoCustomizer.ObjectMeta.DeletionTimestamp.IsZero() {
+						if !newNemoCustomizer.DeletionTimestamp.IsZero() {
 							return true
 						}
 
diff --git a/internal/controller/nemocustomizer_controller_test.go b/internal/controller/nemocustomizer_controller_test.go
@@ -86,7 +86,7 @@ var _ = Describe("NemoCustomizer Controller", func() {
 		Expect(corev1.AddToScheme(scheme)).To(Succeed())
 		Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
 		Expect(batchv1.AddToScheme(scheme)).To(Succeed())
-		Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
+		Expect(gatewayv1.Install(scheme)).To(Succeed())
 
 		client = fake.NewClientBuilder().WithScheme(scheme).
 			WithStatusSubresource(&appsv1alpha1.NemoCustomizer{}).
diff --git a/internal/controller/nimservice_controller.go b/internal/controller/nimservice_controller.go
@@ -42,6 +42,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	lwsv1 "sigs.k8s.io/lws/api/leaderworkerset/v1"
 
 	appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1"
@@ -51,7 +52,6 @@ import (
 	"github.com/NVIDIA/k8s-nim-operator/internal/render"
 	"github.com/NVIDIA/k8s-nim-operator/internal/shared"
 	"github.com/NVIDIA/k8s-nim-operator/internal/utils"
-	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 // NIMServiceFinalizer is the finalizer annotation.
@@ -305,6 +305,9 @@ func (r *NIMServiceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			)
 		},
 	)
+	if err != nil {
+		return err
+	}
 
 	nimServiceBuilder, err = k8sutil.ControllerOwnsIfCRDExists(
 		r.discoveryClient,
diff --git a/internal/controller/nimservice_controller_test.go b/internal/controller/nimservice_controller_test.go
@@ -55,7 +55,7 @@ var _ = Describe("NIMService Controller", func() {
 		Expect(batchv1.AddToScheme(scheme)).To(Succeed())
 		Expect(corev1.AddToScheme(scheme)).To(Succeed())
 		Expect(resourcev1beta2.AddToScheme(scheme)).To(Succeed())
-		Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
+		Expect(gatewayv1.Install(scheme)).To(Succeed())
 
 		testClient = fake.NewClientBuilder().WithScheme(scheme).
 			WithStatusSubresource(&appsv1alpha1.NIMService{}).
diff --git a/internal/controller/platform/kserve/nimservice_test.go b/internal/controller/platform/kserve/nimservice_test.go
@@ -148,7 +148,7 @@ var _ = Describe("NIMServiceReconciler for a KServe platform", func() {
 		Expect(corev1.AddToScheme(scheme)).To(Succeed())
 		Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
 		Expect(kservev1beta1.AddToScheme(scheme)).To(Succeed())
-		Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
+		Expect(gatewayv1.Install(scheme)).To(Succeed())
 
 		client = fake.NewClientBuilder().WithScheme(scheme).
 			WithStatusSubresource(&appsv1alpha1.NIMService{}).
diff --git a/internal/controller/platform/standalone/nimservice_test.go b/internal/controller/platform/standalone/nimservice_test.go
@@ -46,24 +46,22 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/apimachinery/pkg/version"
 	discoveryfake "k8s.io/client-go/discovery/fake"
 	"k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	lwsv1 "sigs.k8s.io/lws/api/leaderworkerset/v1"
 
-	"k8s.io/apimachinery/pkg/version"
-
-	"github.com/NVIDIA/k8s-nim-operator/internal/utils"
-
 	appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1"
 	"github.com/NVIDIA/k8s-nim-operator/internal/conditions"
 	"github.com/NVIDIA/k8s-nim-operator/internal/k8sutil"
 	"github.com/NVIDIA/k8s-nim-operator/internal/render"
-	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+	"github.com/NVIDIA/k8s-nim-operator/internal/utils"
 )
 
 func sortEnvVars(envVars []corev1.EnvVar) {
@@ -146,7 +144,7 @@ var _ = Describe("NIMServiceReconciler for a standalone platform", func() {
 		Expect(corev1.AddToScheme(scheme)).To(Succeed())
 		Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
 		Expect(lwsv1.AddToScheme(scheme)).To(Succeed())
-		Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
+		Expect(gatewayv1.Install(scheme)).To(Succeed())
 
 		client = fake.NewClientBuilder().WithScheme(scheme).
 			WithStatusSubresource(&appsv1alpha1.NIMService{}).
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -350,7 +350,7 @@ func UpdateObject(obj client.Object, desired client.Object) client.Object {
 	case *kservev1beta1.InferenceService:
 		return updateInferenceService(castedObj, desired.(*kservev1beta1.InferenceService)) //nolint:forcetypeassert
 	case *gatewayv1.HTTPRoute:
-		return updateHTTPRoute(castedObj, desired.(*gatewayv1.HTTPRoute))
+		return updateHTTPRoute(castedObj, desired.(*gatewayv1.HTTPRoute)) //nolint:forcetypeassert
 	default:
 		panic("unsupported obj type")
 	}

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ type Ingress struct {`
`122`	`122`	Spec networkingv1.IngressSpec `json:"spec,omitempty"`
`123`	`123`	`}`
`124`	`124`
`125`		`-// HTTPRoute defines attributes to HTTPRoute in Gateway API`
	`125`	`+// HTTPRoute defines attributes to HTTPRoute in Gateway API.`
`126`	`126`	`type HTTPRoute struct {`
`127`	`127`	Enabled *bool `json:"enabled,omitempty"`
`128`	`128`	Annotations map[string]string `json:"annotations,omitempty"`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ func (r *NemoDatastoreReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`251`	`251`	`if ok {`
`252`	`252`
`253`	`253`	`// Handle case where object is marked for deletion`
`254`		`- if !newNemoDatastore.ObjectMeta.DeletionTimestamp.IsZero() {`
	`254`	`+ if !newNemoDatastore.DeletionTimestamp.IsZero() {`
`255`	`255`	`return true`
`256`	`256`	`}`
`257`	`257`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ func (r *NemoEntitystoreReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`249`	`249`	`newNemoEntitystore, ok := e.ObjectNew.(*appsv1alpha1.NemoEntitystore)`
`250`	`250`	`if ok {`
`251`	`251`	`// Handle case where object is marked for deletion`
`252`		`- if !newNemoEntitystore.ObjectMeta.DeletionTimestamp.IsZero() {`
	`252`	`+ if !newNemoEntitystore.DeletionTimestamp.IsZero() {`
`253`	`253`	`return true`
`254`	`254`	`}`
`255`	`255`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ func (r *NemoEvaluatorReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`250`	`250`	`newNemoEvaluator, ok := e.ObjectNew.(*appsv1alpha1.NemoEvaluator)`
`251`	`251`	`if ok {`
`252`	`252`	`// Handle case where object is marked for deletion`
`253`		`- if !newNemoEvaluator.ObjectMeta.DeletionTimestamp.IsZero() {`
	`253`	`+ if !newNemoEvaluator.DeletionTimestamp.IsZero() {`
`254`	`254`	`return true`
`255`	`255`	`}`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ func (r *NemoGuardrailReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`250`	`250`	`newNemoGuardrail, ok := e.ObjectNew.(*appsv1alpha1.NemoGuardrail)`
`251`	`251`	`if ok {`
`252`	`252`	`// Handle case where object is marked for deletion`
`253`		`- if !newNemoGuardrail.ObjectMeta.DeletionTimestamp.IsZero() {`
	`253`	`+ if !newNemoGuardrail.DeletionTimestamp.IsZero() {`
`254`	`254`	`return true`
`255`	`255`	`}`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ func (r *NemoCustomizerReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`265`	`265`	`newNemoCustomizer, ok := e.ObjectNew.(*appsv1alpha1.NemoCustomizer)`
`266`	`266`	`if ok {`
`267`	`267`	`// Handle case where object is marked for deletion`
`268`		`- if !newNemoCustomizer.ObjectMeta.DeletionTimestamp.IsZero() {`
	`268`	`+ if !newNemoCustomizer.DeletionTimestamp.IsZero() {`
`269`	`269`	`return true`
`270`	`270`	`}`
`271`	`271`