Skip to content

Commit e7f4116

Browse files
committed
Update machine update controller and tests
1 parent b2d2dca commit e7f4116

File tree

14 files changed

+412
-491
lines changed

14 files changed

+412
-491
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- name: Run golangci-lint
2222
uses: golangci/golangci-lint-action@v9
2323
with:
24-
version: v2.1
24+
version: v2.6

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_VERSION ?= v5.5.0
119119
ADDLICENSE_VERSION ?= v1.1.1
120120
GEN_CRD_API_REFERENCE_DOCS_VERSION ?= v0.3.0
121121
GOIMPORTS_VERSION ?= v0.31.0
122-
GOLANGCI_LINT_VERSION ?= v2.1
122+
GOLANGCI_LINT_VERSION ?= v2.6
123123
#ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)
124124
ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
125125
#ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)

go.mod

Lines changed: 52 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
module github.com/ironcore-dev/machine-controller-manager-provider-ironcore-metal
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
github.com/Masterminds/sprig v2.22.0+incompatible
77
github.com/coreos/butane v0.25.1
88
github.com/fsnotify/fsnotify v1.9.0
99
github.com/gardener/machine-controller-manager v0.60.0
1010
github.com/imdario/mergo v0.3.16
11-
github.com/ironcore-dev/controller-utils v0.10.0
12-
github.com/ironcore-dev/metal-operator v0.1.0
11+
github.com/ironcore-dev/controller-utils v0.11.0
12+
github.com/ironcore-dev/metal-operator v0.1.1-0.20251124133332-0fc7110bab05
1313
github.com/onsi/ginkgo/v2 v2.27.2
1414
github.com/onsi/gomega v1.38.2
1515
github.com/spf13/pflag v1.0.10
16-
k8s.io/api v0.33.3
17-
k8s.io/apimachinery v0.33.3
18-
k8s.io/client-go v0.33.3
19-
k8s.io/component-base v0.33.3
16+
k8s.io/api v0.34.1
17+
k8s.io/apimachinery v0.34.1
18+
k8s.io/client-go v0.34.1
19+
k8s.io/component-base v0.34.1
2020
k8s.io/klog/v2 v2.130.1
21-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
21+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
2222
sigs.k8s.io/cluster-api v1.10.4
23-
sigs.k8s.io/controller-runtime v0.21.0
23+
sigs.k8s.io/controller-runtime v0.22.3
2424
sigs.k8s.io/yaml v1.6.0
2525
)
2626

27-
replace github.com/gardener/machine-controller-manager => github.com/afritzler/machine-controller-manager v0.0.0-20250514112441-bbd98c0e8666
27+
replace github.com/gardener/machine-controller-manager => github.com/afritzler/machine-controller-manager v0.0.0-20251124134532-311adfebf72a
2828

2929
require (
3030
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -41,68 +41,77 @@ require (
4141
github.com/coreos/ignition/v2 v2.23.0 // indirect
4242
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
4343
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
44-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
44+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
4545
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
46-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
46+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4747
github.com/go-logr/logr v1.4.3 // indirect
4848
github.com/go-logr/zapr v1.3.0 // indirect
49-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
50-
github.com/go-openapi/jsonreference v0.21.0 // indirect
51-
github.com/go-openapi/swag v0.23.1 // indirect
49+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
50+
github.com/go-openapi/jsonreference v0.21.2 // indirect
51+
github.com/go-openapi/swag v0.25.1 // indirect
52+
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
53+
github.com/go-openapi/swag/conv v0.25.1 // indirect
54+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
55+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
56+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
57+
github.com/go-openapi/swag/loading v0.25.1 // indirect
58+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
59+
github.com/go-openapi/swag/netutils v0.25.1 // indirect
60+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
61+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
62+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
5263
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5364
github.com/gogo/protobuf v1.3.2 // indirect
5465
github.com/google/btree v1.1.3 // indirect
5566
github.com/google/gnostic-models v0.7.0 // indirect
5667
github.com/google/go-cmp v0.7.0 // indirect
57-
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
68+
github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d // indirect
5869
github.com/google/uuid v1.6.0 // indirect
5970
github.com/huandu/xstrings v1.5.0 // indirect
6071
github.com/inconshreveable/mousetrap v1.1.0 // indirect
61-
github.com/josharian/intern v1.0.0 // indirect
6272
github.com/json-iterator/go v1.1.12 // indirect
63-
github.com/mailru/easyjson v0.9.0 // indirect
6473
github.com/mitchellh/copystructure v1.2.0 // indirect
6574
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6675
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
67-
github.com/modern-go/reflect2 v1.0.2 // indirect
76+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6877
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6978
github.com/pkg/errors v0.9.1 // indirect
7079
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
71-
github.com/prometheus/client_golang v1.22.0 // indirect
80+
github.com/prometheus/client_golang v1.23.2 // indirect
7281
github.com/prometheus/client_model v0.6.2 // indirect
73-
github.com/prometheus/common v0.64.0 // indirect
74-
github.com/prometheus/procfs v0.16.1 // indirect
82+
github.com/prometheus/common v0.67.1 // indirect
83+
github.com/prometheus/procfs v0.19.1 // indirect
7584
github.com/spf13/cobra v1.10.1 // indirect
7685
github.com/stmcginnis/gofish v0.20.0 // indirect
77-
github.com/stretchr/testify v1.10.0 // indirect
86+
github.com/stretchr/testify v1.11.1 // indirect
7887
github.com/vincent-petithory/dataurl v1.0.0 // indirect
7988
github.com/x448/float16 v0.8.4 // indirect
80-
go.opentelemetry.io/otel v1.36.0 // indirect
81-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
89+
go.opentelemetry.io/otel v1.38.0 // indirect
90+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
8291
go.uber.org/multierr v1.11.0 // indirect
8392
go.uber.org/zap v1.27.0 // indirect
84-
go.yaml.in/yaml/v2 v2.4.2 // indirect
93+
go.yaml.in/yaml/v2 v2.4.3 // indirect
8594
go.yaml.in/yaml/v3 v3.0.4 // indirect
86-
golang.org/x/crypto v0.42.0 // indirect
87-
golang.org/x/mod v0.27.0 // indirect
88-
golang.org/x/net v0.43.0 // indirect
89-
golang.org/x/oauth2 v0.30.0 // indirect
90-
golang.org/x/sync v0.17.0 // indirect
91-
golang.org/x/sys v0.36.0 // indirect
92-
golang.org/x/term v0.35.0 // indirect
93-
golang.org/x/text v0.29.0 // indirect
94-
golang.org/x/time v0.12.0 // indirect
95-
golang.org/x/tools v0.36.0 // indirect
95+
golang.org/x/crypto v0.45.0 // indirect
96+
golang.org/x/mod v0.29.0 // indirect
97+
golang.org/x/net v0.47.0 // indirect
98+
golang.org/x/oauth2 v0.32.0 // indirect
99+
golang.org/x/sync v0.18.0 // indirect
100+
golang.org/x/sys v0.38.0 // indirect
101+
golang.org/x/term v0.37.0 // indirect
102+
golang.org/x/text v0.31.0 // indirect
103+
golang.org/x/time v0.14.0 // indirect
104+
golang.org/x/tools v0.38.0 // indirect
96105
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
97-
google.golang.org/protobuf v1.36.7 // indirect
98-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
106+
google.golang.org/protobuf v1.36.10 // indirect
107+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
99108
gopkg.in/inf.v0 v0.9.1 // indirect
100109
gopkg.in/yaml.v3 v3.0.1 // indirect
101-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
102-
k8s.io/apiserver v0.33.3 // indirect
110+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
111+
k8s.io/apiserver v0.34.1 // indirect
103112
k8s.io/cluster-bootstrap v0.32.6 // indirect
104-
k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
105-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
113+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
114+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
106115
sigs.k8s.io/randfill v1.0.0 // indirect
107-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
116+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
108117
)

0 commit comments

Comments
 (0)