Skip to content

Commit 96d3dae

Browse files
committed
fix: gitlint version to support 1.25 go
1 parent b5acc0e commit 96d3dae

File tree

10 files changed

+10
-11
lines changed

10 files changed

+10
-11
lines changed

operator/cmd/cli/app/node/node_ignore_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ var _ = Describe("Node Ignore Command", func() {
9494

9595
BeforeEach(func() {
9696
output = &bytes.Buffer{}
97-
mockKube = fake.NewSimpleClientset()
97+
mockKube = fake.NewClientset()
9898
kubeClient = client.NewWithClientsAndConfig(mockKube, nil, nil)
9999
cliCtx = context.NewCLIContext(context.NewCLIConfig(context.WithOutputWriter(output)))
100100

operator/cmd/cli/app/node/node_list_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ var _ = Describe("Node List Command", func() {
121121

122122
BeforeEach(func() {
123123
output = &bytes.Buffer{}
124-
mockKube = fake.NewSimpleClientset()
124+
mockKube = fake.NewClientset()
125125
kubeClient = client.NewWithClientsAndConfig(mockKube, nil, nil)
126126
cliCtx = context.NewCLIContext(context.NewCLIConfig(context.WithOutputWriter(output)))
127127
})

operator/cmd/cli/app/node/node_reset_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ var _ = Describe("Node Reset Command", func() {
9595

9696
BeforeEach(func() {
9797
output = &bytes.Buffer{}
98-
mockKube = fake.NewSimpleClientset()
98+
mockKube = fake.NewClientset()
9999
kubeClient = client.NewWithClientsAndConfig(mockKube, nil, nil)
100100
cliCtx = context.NewCLIContext(context.NewCLIConfig(context.WithOutputWriter(output)))
101101

operator/cmd/cli/app/node/node_status_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ var _ = Describe("Node Status Command", func() {
150150

151151
BeforeEach(func() {
152152
output = &bytes.Buffer{}
153-
mockKube = fake.NewSimpleClientset()
153+
mockKube = fake.NewClientset()
154154
kubeClient = client.NewWithClientsAndConfig(mockKube, nil, nil)
155155
cliCtx = context.NewCLIContext(context.NewCLIConfig(context.WithOutputWriter(output)))
156156
})

operator/cmd/cli/app/package/package_logs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ var _ = Describe("Package Logs Command", func() {
271271

272272
BeforeEach(func() {
273273
output = &bytes.Buffer{}
274-
fakeKube = fake.NewSimpleClientset()
274+
fakeKube = fake.NewClientset()
275275
kubeClient = client.NewWithClientsAndConfig(fakeKube, nil, nil)
276276
})
277277

operator/cmd/cli/app/package/package_rerun_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ var _ = Describe("Package Rerun Command", func() {
263263
)
264264

265265
BeforeEach(func() {
266-
fakeKube = fake.NewSimpleClientset()
266+
fakeKube = fake.NewClientset()
267267
mockDynamic = &mockdynamic.Interface{}
268268
mockNSRes = &mockdynamic.NamespaceableResourceInterface{}
269269
kubeClient = client.NewWithClientsAndConfig(fakeKube, mockDynamic, nil)

operator/cmd/cli/app/package/package_status_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ var _ = Describe("Package Status Command", func() {
171171

172172
BeforeEach(func() {
173173
output = &bytes.Buffer{}
174-
fakeKube = fake.NewSimpleClientset()
174+
fakeKube = fake.NewClientset()
175175
mockDynamic = &mockdynamic.Interface{}
176176
mockNSRes = &mockdynamic.NamespaceableResourceInterface{}
177177
kubeClient = client.NewWithClientsAndConfig(fakeKube, mockDynamic, nil)

operator/cmd/cli/app/version_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func TestDiscoverOperatorVersion(t *testing.T) {
176176

177177
for _, tt := range tests {
178178
t.Run(tt.name, func(t *testing.T) {
179-
clientset := fake.NewSimpleClientset()
179+
clientset := fake.NewClientset()
180180

181181
if tt.deployment != nil {
182182
_, err := clientset.AppsV1().Deployments("skyhook").Create(

operator/deps.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ifndef ARCH
3636
endif
3737

3838
## versions
39-
GOLANGCI_LINT_VERSION ?= v2.2.1
39+
GOLANGCI_LINT_VERSION ?= v2.7.2
4040
KUSTOMIZE_VERSION ?= v5.4.1
4141
CONTROLLER_TOOLS_VERSION ?= v0.18.0
4242
ENVTEST_K8S_VERSION ?= 1.35.0

operator/internal/controller/cluster_state_v2_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ package controller
2121
import (
2222
"fmt"
2323

24-
"github.com/go-logr/logr"
2524
. "github.com/onsi/ginkgo/v2"
2625
. "github.com/onsi/gomega"
2726
"sigs.k8s.io/controller-runtime/pkg/log"
@@ -40,7 +39,7 @@ const (
4039

4140
var _ = Describe("cluster state v2 tests", func() {
4241

43-
var logger logr.Logger = log.FromContext(ctx)
42+
logger := log.FromContext(ctx)
4443

4544
It("should check taint toleration", func() {
4645
taints := []corev1.Taint{

0 commit comments

Comments
 (0)