Skip to content

Commit 349f223

Browse files
🌱 Update whatever can be updated easily (#300)
**What is the purpose of this pull request/Why do we need it?** This PR updates whatever is possible to get rid of CVEs, while still not upgrading Cluster API (that'd be another PR/issue). It also removes the tools directory in favor of using the tools directive. **Issue #, if available:** **Description of changes:** **Special notes for your reviewer:** **Checklist:** - [ ] Documentation updated - [ ] Unit Tests added - [ ] E2E Tests added - [x] Includes [emojis](https://github.com/kubernetes-sigs/kubebuilder-release-tools?tab=readme-ov-file#kubebuilder-project-versioning)
1 parent 04c919b commit 349f223

File tree

15 files changed

+742
-1015
lines changed

15 files changed

+742
-1015
lines changed

β€Ž.github/dependabot.ymlβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ updates:
3030
- dependency-name: "google.golang.org/grpc"
3131
update-types:
3232
["version-update:semver-major", "version-update:semver-minor"]
33-
# Bumping the kustomize API independently can break compatibility with client-go as they share k8s.io/kube-openapi as a dependency.
33+
# Bumping the kustomize API independently can break compatibility with client-go as
34+
# they share k8s.io/kube-openapi as a dependency.
3435
- dependency-name: "sigs.k8s.io/kustomize/api"
3536
update-types:
3637
["version-update:semver-major", "version-update:semver-minor"]

β€ŽMakefileβ€Ž

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ cover: ## Print the test coverage.
6060

6161
.PHONY: lint
6262
lint: ## Run lint.
63-
go run -modfile ./tools/go.mod github.com/golangci/golangci-lint/cmd/golangci-lint run --timeout 5m -c .golangci.yml
63+
go tool golangci-lint run --timeout 5m -c .golangci.yml
6464

6565
.PHONY: lint-fix
6666
lint-fix: ## Fix linter problems.
6767
# gci collides with gofumpt. But if we run gci before gofumpt, this will solve the issue.
68-
go run -modfile ./tools/go.mod github.com/golangci/golangci-lint/cmd/golangci-lint run --timeout 5m -c .golangci.yml --enable-only gci --fix
69-
go run -modfile ./tools/go.mod github.com/golangci/golangci-lint/cmd/golangci-lint run --timeout 5m -c .golangci.yml --fix
68+
go tool golangci-lint run --timeout 5m -c .golangci.yml --enable-only gci --fix
69+
go tool golangci-lint run --timeout 5m -c .golangci.yml --fix
7070

7171
.PHONY: vet
7272
vet: ## Run go vet against code.
@@ -202,13 +202,13 @@ $(ENVTEST): $(LOCALBIN)
202202

203203
.PHONY: mocks
204204
mocks:
205-
go run -modfile ./tools/go.mod github.com/vektra/mockery/v2
205+
go tool mockery
206206

207207
# CI
208208

209209
.PHONY: tidy
210210
tidy: ## Run go mod tidy.
211-
go mod tidy -v && go -C tools mod tidy -v
211+
go mod tidy -v
212212

213213
.PHONY: verify-tidy
214214
verify-tidy: tidy ## Verify that the dependencies are tidied.

β€Žgo.modβ€Ž

Lines changed: 204 additions & 49 deletions
Large diffs are not rendered by default.

β€Žgo.sumβ€Ž

Lines changed: 531 additions & 111 deletions
Large diffs are not rendered by default.

β€Žtest/e2e/capic_test.goβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build e2e
2-
// +build e2e
32

43
/*
54
Copyright 2024 IONOS Cloud.

β€Žtest/e2e/common.goβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build e2e
2-
// +build e2e
32

43
/*
54
Copyright 2024 IONOS Cloud.

β€Žtest/e2e/env_test.goβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build e2e
2-
// +build e2e
32

43
/*
54
Copyright 2024 IONOS Cloud.

β€Žtest/e2e/helpers/consts.goβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build e2e
2-
// +build e2e
32

43
/*
54
Copyright 2024 IONOS Cloud.

β€Žtest/e2e/helpers/finalizers.goβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build e2e
2-
// +build e2e
32

43
/*
54
Copyright 2024 IONOS Cloud.

β€Žtest/e2e/helpers/ownerreference.goβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build e2e
2-
// +build e2e
32

43
/*
54
Copyright 2024 IONOS Cloud.

0 commit comments

Comments
Β (0)