Skip to content

Commit 4681a6e

Browse files
mwennrichmwennrich
authored
Update to MCM v0.52.0 (#36)
* update to MCM v1.52 * build with go 1.23 * update alpine to 3.20 * update dependencies * update gh actions
1 parent e65345f commit 4681a6e

File tree

4 files changed

+139
-134
lines changed

4 files changed

+139
-134
lines changed

‎.github/workflows/docker.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
cache: false
3939

4040
- name: Lint
41-
uses: golangci/golangci-lint-action@v4
41+
uses: golangci/golangci-lint-action@v6
4242
with:
4343
args: --build-tags integration -p bugs -p unused --timeout=10m
4444

@@ -49,7 +49,7 @@ jobs:
4949
[ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
5050
5151
- name: Build and push image
52-
uses: docker/build-push-action@v5
52+
uses: docker/build-push-action@v6
5353
with:
5454
context: .
5555
push: true

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM golang:1.22 AS builder
1+
FROM golang:1.23 AS builder
22
WORKDIR /work
33
COPY . .
44
RUN make build
55

6-
FROM alpine:3.19
6+
FROM alpine:3.20
77
RUN apk add --update bash curl tzdata
88
WORKDIR /
99
COPY --from=builder /work/bin/machine-controller /machine-controller

‎go.mod‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
module github.com/metal-stack/machine-controller-manager-provider-metal
22

3-
go 1.22
3+
go 1.23
44

55
require (
6-
github.com/gardener/machine-controller-manager v0.50.1
6+
github.com/gardener/machine-controller-manager v0.52.0
77
github.com/google/go-cmp v0.6.0
8-
github.com/metal-stack/metal-go v0.32.2
9-
github.com/metal-stack/metal-lib v0.17.1
8+
github.com/metal-stack/metal-go v0.34.1
9+
github.com/metal-stack/metal-lib v0.18.2
1010
github.com/onsi/ginkgo v1.16.5
11-
github.com/onsi/gomega v1.33.1
11+
github.com/onsi/gomega v1.34.2
1212
github.com/spf13/pflag v1.0.5
13-
k8s.io/api v0.28.7
14-
k8s.io/component-base v0.28.7
15-
k8s.io/klog/v2 v2.120.1
13+
k8s.io/api v0.29.9
14+
k8s.io/component-base v0.29.9
15+
k8s.io/klog/v2 v2.130.1
1616
)
1717

1818
require (
1919
github.com/Masterminds/semver v1.5.0 // indirect
2020
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
2222
github.com/blang/semver/v4 v4.0.0 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24-
github.com/coreos/go-oidc/v3 v3.10.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24+
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
2525
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
26+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
2727
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
2828
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
2929
github.com/fsnotify/fsnotify v1.7.0 // indirect
30-
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
31-
github.com/go-logr/logr v1.4.1 // indirect
30+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
31+
github.com/go-logr/logr v1.4.2 // indirect
3232
github.com/go-logr/stdr v1.2.2 // indirect
3333
github.com/go-openapi/analysis v0.23.0 // indirect
3434
github.com/go-openapi/errors v0.22.0 // indirect
@@ -40,7 +40,7 @@ require (
4040
github.com/go-openapi/strfmt v0.23.0 // indirect
4141
github.com/go-openapi/swag v0.23.0 // indirect
4242
github.com/go-openapi/validate v0.24.0 // indirect
43-
github.com/goccy/go-json v0.10.2 // indirect
43+
github.com/goccy/go-json v0.10.3 // indirect
4444
github.com/gogo/protobuf v1.3.2 // indirect
4545
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
4646
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -53,14 +53,15 @@ require (
5353
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5454
github.com/josharian/intern v1.0.0 // indirect
5555
github.com/json-iterator/go v1.1.12 // indirect
56+
github.com/klauspost/compress v1.17.9 // indirect
5657
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
5758
github.com/lestrrat-go/httpcc v1.0.1 // indirect
58-
github.com/lestrrat-go/httprc v1.0.5 // indirect
59+
github.com/lestrrat-go/httprc v1.0.6 // indirect
5960
github.com/lestrrat-go/iter v1.0.2 // indirect
60-
github.com/lestrrat-go/jwx/v2 v2.0.21 // indirect
61+
github.com/lestrrat-go/jwx/v2 v2.1.1 // indirect
6162
github.com/lestrrat-go/option v1.0.1 // indirect
6263
github.com/mailru/easyjson v0.7.7 // indirect
63-
github.com/metal-stack/security v0.8.0 // indirect
64+
github.com/metal-stack/security v0.8.1 // indirect
6465
github.com/mitchellh/mapstructure v1.5.0 // indirect
6566
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6667
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -69,35 +70,35 @@ require (
6970
github.com/oklog/ulid v1.3.1 // indirect
7071
github.com/opentracing/opentracing-go v1.2.0 // indirect
7172
github.com/pkg/errors v0.9.1 // indirect
72-
github.com/prometheus/client_golang v1.18.0 // indirect
73-
github.com/prometheus/client_model v0.6.0 // indirect
74-
github.com/prometheus/common v0.47.0 // indirect
75-
github.com/prometheus/procfs v0.12.0 // indirect
73+
github.com/prometheus/client_golang v1.20.3 // indirect
74+
github.com/prometheus/client_model v0.6.1 // indirect
75+
github.com/prometheus/common v0.59.1 // indirect
76+
github.com/prometheus/procfs v0.15.1 // indirect
7677
github.com/segmentio/asm v1.2.0 // indirect
77-
github.com/spf13/cobra v1.8.0 // indirect
78-
go.mongodb.org/mongo-driver v1.14.0 // indirect
79-
go.opentelemetry.io/otel v1.24.0 // indirect
80-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
81-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
82-
golang.org/x/crypto v0.23.0 // indirect
83-
golang.org/x/net v0.25.0 // indirect
84-
golang.org/x/oauth2 v0.20.0 // indirect
85-
golang.org/x/sync v0.7.0 // indirect
86-
golang.org/x/sys v0.20.0 // indirect
87-
golang.org/x/term v0.20.0 // indirect
88-
golang.org/x/text v0.15.0 // indirect
89-
golang.org/x/time v0.5.0 // indirect
90-
google.golang.org/protobuf v1.33.0 // indirect
78+
github.com/spf13/cobra v1.8.1 // indirect
79+
go.mongodb.org/mongo-driver v1.16.1 // indirect
80+
go.opentelemetry.io/otel v1.30.0 // indirect
81+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
82+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
83+
golang.org/x/crypto v0.27.0 // indirect
84+
golang.org/x/net v0.29.0 // indirect
85+
golang.org/x/oauth2 v0.23.0 // indirect
86+
golang.org/x/sync v0.8.0 // indirect
87+
golang.org/x/sys v0.25.0 // indirect
88+
golang.org/x/term v0.24.0 // indirect
89+
golang.org/x/text v0.18.0 // indirect
90+
golang.org/x/time v0.6.0 // indirect
91+
google.golang.org/protobuf v1.34.2 // indirect
9192
gopkg.in/inf.v0 v0.9.1 // indirect
9293
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9394
gopkg.in/yaml.v2 v2.4.0 // indirect
9495
gopkg.in/yaml.v3 v3.0.1 // indirect
95-
k8s.io/apimachinery v0.28.7 // indirect
96-
k8s.io/apiserver v0.28.7 // indirect
97-
k8s.io/client-go v0.28.7 // indirect
98-
k8s.io/cluster-bootstrap v0.28.7 // indirect
99-
k8s.io/kube-openapi v0.0.0-20240220201932-37d671a357a5 // indirect
100-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
96+
k8s.io/apimachinery v0.29.9 // indirect
97+
k8s.io/apiserver v0.29.9 // indirect
98+
k8s.io/client-go v0.29.9 // indirect
99+
k8s.io/cluster-bootstrap v0.29.9 // indirect
100+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
101+
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
101102
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
102103
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
103104
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)