Merge branch 'main' into dependabot/go_modules/github.com/onsi/gomega…

…-1.27.10
tinkerbell · Aug 22, 2023 · 5d9f323 · 5d9f323
2 parents 46a293a + bc4a272
commit 5d9f323
Show file tree

Hide file tree

Showing 10 changed files with 1,158 additions and 1,249 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -6,7 +6,7 @@ linters:
     - bodyclose
     - cyclop
     - deadcode
-    - depguard
+    #- depguard
     - dogsled
     - dupl
     - durationcheck

diff --git a/Makefile b/Makefile
@@ -51,7 +51,7 @@ GO_INSTALL = ./scripts/go_install.sh
 # Binaries.
 CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/[email protected]
 
-GOLANGCI_LINT_VER := v1.51.2
+GOLANGCI_LINT_VER := v1.53.3
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 

diff --git a/api/v1beta1/tinkerbellcluster_webhook.go b/api/v1beta1/tinkerbellcluster_webhook.go
@@ -42,7 +42,7 @@ func (c *TinkerbellCluster) ValidateCreate() error {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (c *TinkerbellCluster) ValidateUpdate(oldRaw runtime.Object) error {
+func (c *TinkerbellCluster) ValidateUpdate(_ runtime.Object) error {
 	return nil
 }