Skip to content

Commit 5c6a8d7

Browse files
committed
Fix linter
Signed-off-by: Sheng Lin <[email protected]>
1 parent 9bb5c3f commit 5c6a8d7

File tree

7 files changed

+11
-7
lines changed

7 files changed

+11
-7
lines changed

internal/controller/nemo_datastore_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ var _ = Describe("NemoDatastore Controller", func() {
9393
Expect(networkingv1.AddToScheme(scheme)).To(Succeed())
9494
Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
9595
Expect(appsv1.AddToScheme(scheme)).To(Succeed())
96-
Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
96+
Expect(gatewayv1.Install(scheme)).To(Succeed())
9797

9898
manifestsDir, err := filepath.Abs("../../manifests")
9999
Expect(err).ToNot(HaveOccurred())

internal/controller/nemo_evaluator_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var _ = Describe("NemoEvaluator Controller", func() {
6969
Expect(corev1.AddToScheme(scheme)).To(Succeed())
7070
Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
7171
Expect(batchv1.AddToScheme(scheme)).To(Succeed())
72-
Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
72+
Expect(gatewayv1.Install(scheme)).To(Succeed())
7373

7474
client = fake.NewClientBuilder().WithScheme(scheme).
7575
WithStatusSubresource(&appsv1alpha1.NemoEvaluator{}).

internal/controller/nemocustomizer_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ var _ = Describe("NemoCustomizer Controller", func() {
8686
Expect(corev1.AddToScheme(scheme)).To(Succeed())
8787
Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
8888
Expect(batchv1.AddToScheme(scheme)).To(Succeed())
89-
Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
89+
Expect(gatewayv1.Install(scheme)).To(Succeed())
9090

9191
client = fake.NewClientBuilder().WithScheme(scheme).
9292
WithStatusSubresource(&appsv1alpha1.NemoCustomizer{}).

internal/controller/nimservice_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var _ = Describe("NIMService Controller", func() {
5555
Expect(batchv1.AddToScheme(scheme)).To(Succeed())
5656
Expect(corev1.AddToScheme(scheme)).To(Succeed())
5757
Expect(resourcev1beta2.AddToScheme(scheme)).To(Succeed())
58-
Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
58+
Expect(gatewayv1.Install(scheme)).To(Succeed())
5959

6060
testClient = fake.NewClientBuilder().WithScheme(scheme).
6161
WithStatusSubresource(&appsv1alpha1.NIMService{}).

internal/controller/platform/kserve/nimservice_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ var _ = Describe("NIMServiceReconciler for a KServe platform", func() {
148148
Expect(corev1.AddToScheme(scheme)).To(Succeed())
149149
Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
150150
Expect(kservev1beta1.AddToScheme(scheme)).To(Succeed())
151-
Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
151+
Expect(gatewayv1.Install(scheme)).To(Succeed())
152152

153153
client = fake.NewClientBuilder().WithScheme(scheme).
154154
WithStatusSubresource(&appsv1alpha1.NIMService{}).

internal/controller/platform/standalone/nimservice_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ var _ = Describe("NIMServiceReconciler for a standalone platform", func() {
148148
Expect(monitoringv1.AddToScheme(scheme)).To(Succeed())
149149
Expect(lwsv1.AddToScheme(scheme)).To(Succeed())
150150
Expect(resourcev1beta2.AddToScheme(scheme)).To(Succeed())
151-
Expect(gatewayv1.AddToScheme(scheme)).To(Succeed())
151+
Expect(gatewayv1.Install(scheme)).To(Succeed())
152152

153153
client = fake.NewClientBuilder().WithScheme(scheme).
154154
WithStatusSubresource(&appsv1alpha1.NIMService{}).

internal/webhook/apps/v1alpha1/nimservice_webhook_validation_helper.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,17 @@ func validateNIMServiceSpec(spec *appsv1alpha1.NIMServiceSpec, fldPath *field.Pa
103103
warningList = append(warningList, w...)
104104
errList = append(errList, err...)
105105

106+
w, err = validateExposeConfiguration(&spec.Expose, fldPath.Child("expose"))
107+
warningList = append(warningList, w...)
108+
errList = append(errList, err...)
109+
106110
return warningList, errList
107111
}
108112

109113
func validateExposeConfiguration(expose *appsv1alpha1.Expose, fldPath *field.Path) (admission.Warnings, field.ErrorList) {
110114
warningList := admission.Warnings{}
111115
errList := field.ErrorList{}
112-
if expose.Ingress.Enabled != nil && *expose.Ingress.Enabled {
116+
if expose.Ingress.Enabled != nil && *expose.Ingress.Enabled { //nolint:staticcheck
113117
warningList = append(warningList, ".spec.expose.ingress is deprecated, use .spec.router instead.")
114118
}
115119
return warningList, errList

0 commit comments

Comments
 (0)