Revendor g/g 1.96. also migrate to vgopath (#48)

.github/workflows/test.yaml

@@ -20,10 +20,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Set up Go 1.22
+    - name: Set up Go 1.23
       uses: actions/setup-go@v5
       with:
-        go-version: '1.22.x'
+        go-version: '1.23.x'
 
     - name: Check (lint) and Test
       run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.20 AS builder
+FROM golang:1.23-alpine3.20 AS builder
 RUN apk add make git gcc musl-dev
 WORKDIR /work
 COPY . .

Makefile

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ENSURE_GARDENER_MOD         := $(shell go get github.com/gardener/gardener@$$(go list -m -f "{{.Version}}" github.com/gardener/gardener))
+GARDENER_HACK_DIR    		:= $(shell go list -m -f "{{.Dir}}" github.com/gardener/gardener)/hack
 REGISTRY                    := ghcr.io
 IMAGE_PREFIX                := $(REGISTRY)/metal-stack
 IMAGE_TAG                   := $(or ${GITHUB_TAG_NAME}, latest)
@@ -27,8 +29,8 @@ VERIFY                      := true
 LEADER_ELECTION             := false
 IGNORE_OPERATION_ANNOTATION := false
 
-GOLANGCI_LINT_VERSION := v1.59.1
-GO_VERSION := 1.22
+GOLANGCI_LINT_VERSION := v1.61.0
+GO_VERSION := 1.23
 
 ifeq ($(CI),true)
   DOCKER_TTY_ARG=""
@@ -41,8 +43,8 @@ export GO111MODULE := on
 
 ### Build commands
 
-TOOLS_DIR := hack/tools
--include vendor/github.com/gardener/gardener/hack/tools.mk
+TOOLS_DIR := $(HACK_DIR)/tools
+include $(GARDENER_HACK_DIR)/tools.mk
 
 .PHONY: all
 all:
@@ -52,29 +54,25 @@ all:
 .PHONY: clean
 clean:
 	rm os-metal
+	@$(shell find ./example -type f -name "controller-registration.yaml" -exec rm '{}' \;)
+	@bash $(GARDENER_HACK_DIR)/clean.sh ./cmd/... ./pkg/...
 
 .PHONY: install
-install: revendor $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCKGEN)
+install: tidy $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCKGEN)
 	@LD_FLAGS="-w -X github.com/gardener/$(EXTENSION_PREFIX)-$(NAME)/pkg/version.Version=$(VERSION)" \
-	$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/install.sh ./...
+	bash $(GARDENER_HACK_DIR)/install.sh ./...
 
 .PHONY: tidy
 tidy:
 	@GO111MODULE=on go mod tidy
-
-.PHONY: revendor
-revendor:
-	@GO111MODULE=on go mod tidy
-	@GO111MODULE=on go mod vendor
-	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/*
-	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/.ci/*
+	@mkdir -p $(REPO_ROOT)/.ci/hack && cp $(GARDENER_HACK_DIR)/.ci/* $(REPO_ROOT)/.ci/hack/ && chmod +xw $(REPO_ROOT)/.ci/hack/*
 
 .PHONY: generate
-generate: $(HELM) $(YQ)
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate-sequential.sh ./charts/... ./cmd/... ./pkg/...
+generate: $(VGOPATH) $(HELM) $(YQ)
+	@REPO_ROOT=$(REPO_ROOT) VGOPATH=$(VGOPATH) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) bash $(GARDENER_HACK_DIR)/generate-sequential.sh ./charts/... ./cmd/... ./pkg/...
 
 .PHONE: generate-in-docker
-generate-in-docker: revendor $(HELM) $(YQ)
+generate-in-docker: tidy $(HELM) $(YQ)
 	docker run --rm -it -v $(PWD):/go/src/github.com/metal-stack/os-metal-extension golang:$(GO_VERSION) \
 		sh -c "cd /go/src/github.com/metal-stack/os-metal-extension \
 				&& make generate \
@@ -86,15 +84,15 @@ check-generate:
 
 .PHONY: check
 check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM)
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check.sh --golangci-lint-config=./.golangci.yaml ./cmd/... ./pkg/...
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-charts.sh ./charts
+	@REPO_ROOT=$(REPO_ROOT) bash $(GARDENER_HACK_DIR)/check.sh --golangci-lint-config=./.golangci.yaml ./cmd/... ./pkg/...
+	@REPO_ROOT=$(REPO_ROOT) bash $(GARDENER_HACK_DIR)/check-charts.sh ./charts
 
 .PHONY: test
 test:
-	@SKIP_FETCH_TOOLS=1 $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/test.sh ./cmd/... ./pkg/...
+	@bash $(GARDENER_HACK_DIR)/test.sh ./cmd/... ./pkg/...
 
 .PHONY: test-in-docker
-test-in-docker: revendor
+test-in-docker: tidy
 	docker run --rm -i$(DOCKER_TTY_ARG) \
 		--user $$(id -u):$$(id -g) \
 		--mount type=tmpfs,destination=/.cache \

charts/os-metal/doc.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate sh -c "../../vendor/github.com/gardener/gardener/hack/generate-controller-registration.sh  os-metal . $(cat ../../VERSION) ../../example/controller-registration.yaml OperatingSystemConfig:ubuntu  OperatingSystemConfig:debian"
+//go:generate sh -c "bash $GARDENER_HACK_DIR/generate-controller-registration.sh os-metal . $(cat ../../VERSION) ../../example/controller-registration.yaml OperatingSystemConfig:ubuntu  OperatingSystemConfig:debian"
 
 // Package chart enables go:generate support for generating the correct controller registration.
 package chart

example/controller-registration.yaml

@@ -1,11 +1,10 @@
 ---
-apiVersion: core.gardener.cloud/v1beta1
+apiVersion: core.gardener.cloud/v1
 kind: ControllerDeployment
 metadata:
   name: os-metal
-type: helm
-providerConfig:
-  chart: H4sIAAAAAAAAA+1a62/juBHfz/orpr4C3RSRFD+StC7ug8/x7QXNJUGcy2FRFAtaomVeZFElKTve3PZv75B6WHac124eSI8/BDZFcR6c4XCGjLl0p1SR2H/3fNhB7O/umm/E+rdpN9udZmu3tben+5vN1n7nHew+o04VMqmIAHgnOFd3jbvv/RsFL/3vTWg8ZVHCBX1qGdrBe53Orf5Ht6/5v91pN9/BzlMrsgl/cP9/B6dEKSoSCYpD7n+YT2gCo4zFIUsiSElwSSIqPec7OJ8wCTJLUy4UNnDNxBDFfARTooIJjt4GQWOi2IwinZrU+kkSIoOERviWJ/A+FXTMrmgIc4bj/rTlwUkSL4AnhlKrBCkVELOEeo53MPw0VKgbsujz6RQZXPSHEDIhHS9iyjefufqON/osfPNZdkwiX3+Uj3KW+EtGI5xflsKYxVQ6f/XkPMXPEbnETzXF9n9x6AURjGcSDg8GKDAV/DcaKMdjISV+Pg67HG8mAx5S33ltrz4cVfz3J0Qob0Gm8ZPLuC/+W53mevy3mns2/l8CJGUXVEiMyC7Mmg5J0+qx0fR2Gk5IZSBYqkxXD37CLAGBXisw5gLUhMIHIkKaYKj2MbhOhviVKMJ0xxFLsiugV4om0sR8L2ZBzLPwL9KBYviWk5Ap7UK5EJ1ZKX/HQwXeUCi9SVTxH/LAi/izyLgn/lvNZnst/lvtvV0b/y8B38c4TBeYKScK3gdb0Npp/h2GvVMYDgADnCTmgYwxPTKiKAR8mpJk4UEPU78hk5jyJRUzGnp5faAzKeA3BjsGPmb4LAlpvlf0sJjAryEfqznBSuMoH7INMw9auFMENFVAJCRcIR1HEjFnErklhvzosD84RsW0BMf38a/ksEFIxbvY0aDl7cB7PaBRvGps/UOzWPAM65SFFgoZClPVJAqFULqeNhogCWher6ilAE/z+Fjw4CO99wFBghSfxvWBQFShtMFEqbTr+/P53CNGY4+LyC+MJv1iri5qXVD9kmCFoq39n4wJnPFoAbhfIwEZoa4xmRuHRYLiO13MJTAXWBTp4ksWBtdsQiaVYKNMrRit1BGnXh+AZsMl0OgN4XDYgB96w8Phtmby6+H5Tye/nMOvvbOz3vH54WAIJ2fQPzk+ODw/PDnGpx+hd/wR/nl4fLANlGlPojmx6MMZoJpMmxNXjOY1pHRFhTKxyJQGbMwCnFoSZViCQsQxOySmKKViyqR2qzSVJbKJ2ZQpU1zKm/PyHBwS8W6kM5Vex3ICbgANz/Pxb0aTkAsfS8hJNvLQ135UJLVlY4Jlol+SuwEmOcHjmApX0EgbzEj2kG2VysCDP78PiIJcyMXgbIim2Soe6RVBG1D/Nk66FIOTVIvDCQ8XUtEpptYxi7rZKEtUBre8DekIF2pDTxiLe1O7FxmbJnqlSFixQ17MG6MXndq+2nQBFwLLXFhqCCsaOmmdu83UbxFV/sf1k+LBDTeeJ5fx+Pufdmu/Ze9/XgIb/B/SNOaLKU2e6jh4T/3X3m3urvl/r91p2frvJVA//2ExIX08BF6yJOzCQbUMHL1CQqJIF09t+WmtzIpudbhzqwNcPkZicsCB19fgndGYEkzBx2U3fPmCo2IyorHUPEGL9i6zESZ3ikvQY9x/iBysofA4ijnXNxno/uE3xbAE/Z9s0lQrqSsQraCgpsyS+agLEmdIXXT2OSbjfEYSyQPFRT4nc/V1VJvk10/z8ZoDlAFdKFNzoUa8ote3aPY1uuXA4XMucLVFXinGM9cDvuKuQKuyKXVxgZrDhcD1Gcd8TsOH0YeJfCRFmo3Qn24x5tHUgs10YfggcqyCeSYCNNZNRkjmygnuNtLVRl0awFVB6nY67VXO5RI1bRyH5W4vCPSaPH6gA4PyvqZaDu6DojwHm2IF2IVGLTBMlw4PLhlGwwJ93r3xWpEI+xurfE6zOD7l6IXFSqTlFGn1sr6IsFif4gFguZJd8G8o6YLrTsmVrtqDDIvaRGGtrR/0ne/3NUnLUte0i8HDRRLIulDNb0JxyxlRotxqu/v+jt1uEyHypnOXJQr9RtDrWqXwVn0qOs/QHRZkw5xqXQoe4nSxXzuorDAuXveXb+F3+I3jmbGx3Vjnld+buzw/buAqIAmelU3zNmVzkpOSolcR1HnTZFb3W77ojga9g8HZp8HRoK9Pkp+Oez8Phqe9/qAaCTDTAn8UfNqtdQKe2WkcntHxam/Rf0rUpFvtg17ltGpsFZR18utrF8/SH/VZbLnvF+PQYngWxQhR0Gzpeb12Mv8KbKj/xIgET/qPgPvqv53O+v3f7o69/3sZuK7r1GtA43ySqQkX7HN+zL/8m8npVWHYj9FmVJzxmD66MnwDNZ/IYr0FuEjIPgiepUZdd/lvjPWk7axtHS4EuYWkeeDlJY00lzSBuaS565WP2qnszhFjlpCYfc5FYGkwKgRHVJnvmMm8Mdc1qGmlVStL0WP0myaIxZXOnyJ8mPwbohqNmzwx+wmqZL39NfNEQj272kSXs3+QHrmNpyTNVaEz3N/XxBcyNrPTHNAyqHkteu4VY9bgZjEPNujTSS7tuzRrpUC5er5p3/gBO3BR/19uHzi9ogQpfXSHdXDUzU31IbaQ2Uj/BMFsVDmH4Urx/4Qn9ddOURbPiA31X3GKJPlCeoJK8L7ff3Ta6/d/+819W/+9CNZ+/7FxK/nDXv+9tnNeAFX8z/LD7XP8AOze+L9x/mt39nZs/L8E8uu7/Iq7uK7DOJoEQkeHWRkuGii4rO7UlrGl75hJ1AWTNXTBkdZu73rxnCyk4yxrT7j+4ji1KyItdO2KrQu72Hnr1VEXxiSWuj6qrsLy7WPTfVgX2juOc/Oaqwv/+rfjlDuFps/bMS2YjZFtJugHPSuj9Gu7yMLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLiTvwPpxLAOwBQAAA=
+helm:
+  rawChart: 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
   values:
     image:
       tag: 0.0.1

go.mod

@@ -1,26 +1,24 @@
 module github.com/metal-stack/os-metal-extension
 
-go 1.22.0
-
-toolchain go1.22.5
+go 1.23
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
 	github.com/flatcar/container-linux-config-transpiler v0.9.4
-	github.com/gardener/gardener v1.89.4
+	github.com/gardener/gardener v1.96.6
 	github.com/go-logr/logr v1.4.2
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.6.0
-	github.com/metal-stack/gardener-extension-provider-metal v0.24.4
+	github.com/metal-stack/gardener-extension-provider-metal v0.25.0
 	github.com/onsi/ginkgo/v2 v2.20.0
 	github.com/onsi/gomega v1.34.1
 	github.com/spf13/cobra v1.8.1
-	k8s.io/api v0.29.3
-	k8s.io/apimachinery v0.29.3
-	k8s.io/code-generator v0.29.3
-	k8s.io/component-base v0.29.3
-	k8s.io/utils v0.0.0-20240310230437-4693a0247e57
-	sigs.k8s.io/controller-runtime v0.16.6
+	k8s.io/api v0.29.5
+	k8s.io/apimachinery v0.29.5
+	k8s.io/code-generator v0.29.5
+	k8s.io/component-base v0.29.5
+	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
+	sigs.k8s.io/controller-runtime v0.17.5
 )
 
 require (
@@ -38,15 +36,16 @@ require (
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fatih/color v1.17.0 // indirect
 	github.com/flatcar/ignition v0.36.2 // indirect
-	github.com/fluent/fluent-operator/v2 v2.2.0 // indirect
+	github.com/fluent/fluent-operator/v2 v2.8.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/gardener/cert-management v0.14.3 // indirect
 	github.com/gardener/etcd-druid v0.22.0 // indirect
-	github.com/gardener/hvpa-controller/api v0.5.0 // indirect
-	github.com/gardener/machine-controller-manager v0.50.1 // indirect
+	github.com/gardener/hvpa-controller/api v0.15.0 // indirect
+	github.com/gardener/machine-controller-manager v0.53.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/errors v0.22.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -68,7 +67,7 @@ require (
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/ironcore-dev/vgopath v0.1.3 // indirect
+	github.com/ironcore-dev/vgopath v0.1.4 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
@@ -83,24 +82,24 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.0 // indirect
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 // indirect
 	github.com/prometheus/client_golang v1.19.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.54.0 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/vincent-petithory/dataurl v1.0.0 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
 	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
 	golang.org/x/mod v0.20.0 // indirect
@@ -118,22 +117,21 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	helm.sh/helm/v3 v3.11.1 // indirect
-	istio.io/api v1.19.2-0.20231011000955-f3015ebb5bd4 // indirect
-	istio.io/client-go v1.19.3 // indirect
-	k8s.io/apiextensions-apiserver v0.29.3 // indirect
+	helm.sh/helm/v3 v3.14.4 // indirect
+	istio.io/api v1.22.0 // indirect
+	istio.io/client-go v1.22.0 // indirect
+	k8s.io/apiextensions-apiserver v0.29.5 // indirect
 	k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e // indirect
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible // indirect
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
-	k8s.io/helm v2.17.0+incompatible // indirect
 	k8s.io/klog v1.0.0 // indirect
-	k8s.io/klog/v2 v2.110.1 // indirect
-	k8s.io/kube-aggregator v0.28.3 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/kube-aggregator v0.29.5 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
-	k8s.io/kubelet v0.29.3 // indirect
-	k8s.io/metrics v0.28.3 // indirect
+	k8s.io/kubelet v0.29.5 // indirect
+	k8s.io/metrics v0.29.5 // indirect
 	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9 // indirect
-	sigs.k8s.io/controller-tools v0.13.0 // indirect
+	sigs.k8s.io/controller-tools v0.14.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect