Skip to content

Commit 7183146

Browse files
authored
(testing): Bump K8S_VERSION for testing to 1.26.0 (#6351)
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
1 parent e5a6930 commit 7183146

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

.golangci.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@ run:
33
linters:
44
enable:
55
- nakedret
6-
- interfacer
7-
- varcheck
8-
- deadcode
9-
- structcheck
106
- misspell
11-
- maligned
127
- ineffassign
138
- goconst
149
- goimports
1510
- errcheck
1611
- dupl
1712
- unparam
18-
- golint
13+
- revive
1914
- staticcheck
2015
- unused
2116
- gosimple
@@ -27,7 +22,7 @@ issues:
2722
# Allow dot imports for ginkgo and gomega
2823
- source: ginkgo|gomega
2924
linters:
30-
- golint
25+
- revive
3126
text: "should not use dot imports"
3227

3328
- linters:

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export IMAGE_VERSION = v1.27.0
99
export SIMPLE_VERSION = $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git)
1010
export GIT_VERSION = $(shell git describe --dirty --tags --always)
1111
export GIT_COMMIT = $(shell git rev-parse HEAD)
12-
export K8S_VERSION = 1.25.0
12+
export K8S_VERSION = 1.26.0
1313

1414
# Build settings
1515
export TOOLS_DIR = tools/bin
@@ -57,7 +57,7 @@ fix: ## Fixup files in the repo.
5757

5858
.PHONY: setup-lint
5959
setup-lint: ## Setup the lint
60-
$(SCRIPTS_DIR)/fetch golangci-lint 1.50.0
60+
$(SCRIPTS_DIR)/fetch golangci-lint 1.51.2
6161

6262
.PHONY: lint
6363
lint: setup-lint ## Run the lint check
@@ -175,12 +175,12 @@ cluster-create::
175175

176176
.PHONY: dev-install
177177
dev-install::
178-
$(SCRIPTS_DIR)/fetch kind 0.16.0
178+
$(SCRIPTS_DIR)/fetch kind 0.17.0
179179
$(SCRIPTS_DIR)/fetch kubectl $(K8S_VERSION) # Install kubectl AFTER envtest because envtest includes its own kubectl binary
180180

181181
.PHONY: test-e2e-teardown
182182
test-e2e-teardown:
183-
$(SCRIPTS_DIR)/fetch kind 0.16.0
183+
$(SCRIPTS_DIR)/fetch kind 0.17.0
184184
$(TOOLS_DIR)/kind delete cluster --name $(KIND_CLUSTER)
185185
rm -f $(KUBECONFIG)
186186

internal/ansible/runner/runner_test.go

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

248248
func TestMakeParameters(t *testing.T) {
249249
var (
250-
inputSpec string = "testKey"
250+
inputSpec = "testKey"
251251
)
252252

253253
testCases := []struct {

0 commit comments

Comments
 (0)