Skip to content

Commit 1e9cb16

Browse files
committed
Bump kubernetes dependencies to v0.31.x.
1 parent fe6fe05 commit 1e9cb16

20 files changed

+473
-703
lines changed

.golangci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# golangci-lint configuration file
22
# see: https://golangci-lint.run/usage/configuration/
33

4-
# Options for analysis running
5-
run:
6-
# Which dirs to skip: they won't be analyzed;
7-
skip-dirs:
4+
# Settings related to issues
5+
issues:
6+
# Which dirs to exclude: issues from them won't be reported
7+
exclude-dirs:
88
- bin
99

1010
# Settings for enabling and disabling linters

Makefile

+1-11
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ help: ## Display this help.
7979

8080
include Makefile-deps.mk
8181

82-
include Makefile-deps.mk
83-
8482
##@ Development
8583

8684
.PHONY: manifests
@@ -128,14 +126,6 @@ test-integration: manifests fmt vet envtest ginkgo ## Run integration tests.
128126
test-e2e: kustomize manifests fmt vet envtest ginkgo kind-image-build
129127
E2E_KIND_VERSION=$(E2E_KIND_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ./hack/e2e-test.sh
130128

131-
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
132-
GOLANGCI_LINT_VERSION ?= v1.54.2
133-
golangci-lint:
134-
@[ -f $(GOLANGCI_LINT) ] || { \
135-
set -e ;\
136-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) $(GOLANGCI_LINT_VERSION) ;\
137-
}
138-
139129
.PHONY: lint
140130
lint: golangci-lint ## Run golangci-lint linter & yamllint
141131
$(GOLANGCI_LINT) run --timeout 15m0s
@@ -224,7 +214,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
224214

225215
## Tool Versions
226216
KUSTOMIZE_VERSION ?= v5.2.1
227-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
217+
CONTROLLER_TOOLS_VERSION ?= v0.16.2
228218
# Use go.mod go version as a single source of truth of Ginkgo version.
229219
GINKGO_VERSION ?= $(shell go list -m -f '{{.Version}}' github.com/onsi/ginkgo/v2)
230220

Makefile-deps.mk

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ else
2121
endif
2222
GO_CMD ?= go
2323

24+
GOLANGCI_LINT = $(PROJECT_DIR)/bin/golangci-lint
25+
golangci-lint:
26+
@GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on $(GO_CMD) install github.com/golangci/golangci-lint/cmd/[email protected]
2427

2528
GENREF = $(PROJECT_DIR)/bin/genref
2629
.PHONY: genref

client-go/applyconfiguration/leaderworkerset/v1/leaderworkerset.go

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/leaderworkerset/v1/leaderworkersetspec.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/leaderworkerset/v1/leaderworkersetstatus.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/leaderworkerset/v1/leaderworkertemplate.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/leaderworkerset/v1/rollingupdateconfiguration.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/leaderworkerset/v1/rolloutstrategy.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/leaderworkerset/v1/subgrouppolicy.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/utils.go

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/clientset/versioned/fake/clientset_generated.go

+38-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)