Merge pull request #320 from tinkerbell/dependabot/go_modules/k8s.io/…

…apimachinery-0.29.0

.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ env:
   REGISTRY: quay.io
   IMAGE: quay.io/${{ github.repository }}
   CGO_ENABLED: 0
-  GO_VERSION: "1.20"
+  GO_VERSION: "1.21"
 
 jobs:
   lint:

.golangci.yml

@@ -83,6 +83,7 @@ linters-settings:
       - name: range-val-in-closure
       - name: range-val-address
       - name: dot-imports
+        disabled: true # Disable until dot-import is allowed in test files.
       - name: error-naming
       - name: error-return
       - name: error-strings
@@ -112,7 +113,7 @@ linters-settings:
       - name: waitgroup-by-value
 
   unused:
-    go: "1.20"
+    go: "1.21"
 
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source

Makefile

@@ -32,7 +32,7 @@ help:
 
 # -- Tooling
 
-GOLANGCI_LINT_VERSION 	?= v1.51.2
+GOLANGCI_LINT_VERSION 	?= v1.55.2
 GOLANGCI_LINT 			:= $(TOOLS_DIR)/golangci-lint
 $(GOLANGCI_LINT):
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
@@ -74,7 +74,7 @@ tools: $(GOLANGCI_LINT) $(MOCKGEN) $(SETUP_ENVTEST) $(HADOLINT) $(YAMLLINT_BIN)
 
 .PHONY: clean-tools
 clean-tools: ## Remove tools installed for development.
-	chmod -R +w $(TOOLS_DIR)/envtest
+	@chmod -R +w $(TOOLS_DIR)/envtest &> /dev/null || true
 	rm -rf $(TOOLS_DIR)
 
 # -- Everything else
@@ -115,7 +115,7 @@ setup-envtest: $(SETUP_ENVTEST)
 
 # Integration tests are located next to unit test. This recipe will search the code base for
 # files including the "//go:build integration" build tag and build them into the test binary.
-# For packages containing both unit and integration tests its recommended to populate 
+# For packages containing both unit and integration tests its recommended to populate
 # "//go:build !integration" in all unit test sources so as to avoid compiling them in this recipe.
 .PHONY: test-integration
 test-integration: ## Run integration tests.
@@ -134,7 +134,7 @@ image: build
 	DOCKER_BUILDKIT=1 docker build $(IMAGE_ARGS) .
 
 mocks: ## Generate mocks for testing.
-mocks: $(MOCKGEN) 
+mocks: $(MOCKGEN)
 	$(MOCKGEN) \
 		-destination internal/frontend/ec2/frontend_mock_test.go \
 		-package ec2 \

go.mod

@@ -1,6 +1,8 @@
 module github.com/tinkerbell/hegel
 
-go 1.19
+go 1.21
+
+toolchain go1.21.4
 
 require (
 	github.com/equinix-labs/otel-init-go v0.0.9
@@ -18,7 +20,7 @@ require (
 	github.com/spf13/viper v1.17.0
 	github.com/tinkerbell/tink v0.8.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/apimachinery v0.27.4
+	k8s.io/apimachinery v0.29.0
 	k8s.io/client-go v0.26.3
 	sigs.k8s.io/controller-runtime v0.14.6
 )
@@ -37,7 +39,7 @@ require (
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -46,7 +48,8 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gnostic v0.7.0 // indirect
+	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
@@ -106,10 +109,10 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.26.3 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
-	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )