Skip to content

Commit 61e8ff9

Browse files
authored
Revendor MCM v0.57.1. (#41)
1 parent 27c6f22 commit 61e8ff9

File tree

6 files changed

+136
-143
lines changed

6 files changed

+136
-143
lines changed

.github/workflows/docker.yaml

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

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

4545
- name: Make tag
4646
run: |

.github/workflows/release-drafter.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: release-drafter/release-drafter@v5
13+
- uses: release-drafter/release-drafter@v6
1414
env:
1515
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/dev
66
/test
77
/logs
8+
.ci/
89

910
.vscode
1011
.idea

Dockerfile

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

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

go.mod

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

3-
go 1.23
3+
go 1.24
44

55
require (
6-
github.com/gardener/machine-controller-manager v0.54.0
7-
github.com/google/go-cmp v0.6.0
8-
github.com/metal-stack/metal-go v0.40.1
9-
github.com/metal-stack/metal-lib v0.20.1
6+
github.com/gardener/machine-controller-manager v0.57.1
7+
github.com/google/go-cmp v0.7.0
8+
github.com/metal-stack/metal-go v0.41.2
9+
github.com/metal-stack/metal-lib v0.23.1
1010
github.com/onsi/ginkgo v1.16.5
11-
github.com/onsi/gomega v1.36.2
11+
github.com/onsi/gomega v1.37.0
1212
github.com/spf13/pflag v1.0.6
13-
k8s.io/api v0.31.0
14-
k8s.io/component-base v0.31.0
13+
k8s.io/api v0.32.3
14+
k8s.io/component-base v0.32.3
1515
k8s.io/klog/v2 v2.130.1
1616
)
1717

1818
require (
19-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
19+
github.com/Masterminds/semver/v3 v3.3.1 // 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
2323
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24-
github.com/coreos/go-oidc/v3 v3.12.0 // indirect
24+
github.com/coreos/go-oidc/v3 v3.13.0 // indirect
2525
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
27-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
28-
github.com/fsnotify/fsnotify v1.7.0 // indirect
26+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
27+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
28+
github.com/fsnotify/fsnotify v1.8.0 // indirect
2929
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
30-
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
30+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
3131
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
34-
github.com/go-openapi/errors v0.22.0 // indirect
35-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
34+
github.com/go-openapi/errors v0.22.1 // indirect
35+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
3636
github.com/go-openapi/jsonreference v0.21.0 // indirect
3737
github.com/go-openapi/loads v0.22.0 // indirect
3838
github.com/go-openapi/runtime v0.28.0 // indirect
3939
github.com/go-openapi/spec v0.21.0 // indirect
4040
github.com/go-openapi/strfmt v0.23.0 // indirect
41-
github.com/go-openapi/swag v0.23.0 // indirect
41+
github.com/go-openapi/swag v0.23.1 // indirect
4242
github.com/go-openapi/validate v0.24.0 // indirect
43-
github.com/goccy/go-json v0.10.4 // indirect
43+
github.com/goccy/go-json v0.10.5 // indirect
4444
github.com/gogo/protobuf v1.3.2 // indirect
45-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
46-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
45+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
4746
github.com/golang/protobuf v1.5.4 // indirect
4847
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
4948
github.com/google/gofuzz v1.2.0 // indirect
5049
github.com/google/uuid v1.6.0 // indirect
5150
github.com/gorilla/mux v1.8.1 // indirect
52-
github.com/imdario/mergo v0.3.16 // indirect
5351
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5452
github.com/josharian/intern v1.0.0 // indirect
5553
github.com/json-iterator/go v1.1.12 // indirect
@@ -58,7 +56,7 @@ require (
5856
github.com/lestrrat-go/httpcc v1.0.1 // indirect
5957
github.com/lestrrat-go/httprc v1.0.6 // indirect
6058
github.com/lestrrat-go/iter v1.0.2 // indirect
61-
github.com/lestrrat-go/jwx/v2 v2.1.3 // indirect
59+
github.com/lestrrat-go/jwx/v2 v2.1.4 // indirect
6260
github.com/lestrrat-go/option v1.0.1 // indirect
6361
github.com/mailru/easyjson v0.9.0 // indirect
6462
github.com/metal-stack/security v0.9.3 // indirect
@@ -75,33 +73,33 @@ require (
7573
github.com/prometheus/common v0.59.1 // indirect
7674
github.com/prometheus/procfs v0.15.1 // indirect
7775
github.com/segmentio/asm v1.2.0 // indirect
78-
github.com/spf13/cobra v1.8.1 // indirect
76+
github.com/spf13/cobra v1.9.1 // indirect
7977
github.com/x448/float16 v0.8.4 // indirect
80-
go.mongodb.org/mongo-driver v1.17.1 // indirect
81-
go.opentelemetry.io/otel v1.30.0 // indirect
82-
go.opentelemetry.io/otel/metric v1.30.0 // indirect
83-
go.opentelemetry.io/otel/trace v1.30.0 // indirect
84-
golang.org/x/crypto v0.32.0 // indirect
85-
golang.org/x/net v0.34.0 // indirect
86-
golang.org/x/oauth2 v0.25.0 // indirect
87-
golang.org/x/sync v0.10.0 // indirect
88-
golang.org/x/sys v0.29.0 // indirect
89-
golang.org/x/term v0.28.0 // indirect
90-
golang.org/x/text v0.21.0 // indirect
91-
golang.org/x/time v0.6.0 // indirect
92-
google.golang.org/protobuf v1.36.1 // indirect
78+
go.mongodb.org/mongo-driver v1.17.3 // indirect
79+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
80+
go.opentelemetry.io/otel v1.35.0 // indirect
81+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
82+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
83+
golang.org/x/crypto v0.36.0 // indirect
84+
golang.org/x/net v0.38.0 // indirect
85+
golang.org/x/oauth2 v0.28.0 // indirect
86+
golang.org/x/sync v0.12.0 // indirect
87+
golang.org/x/sys v0.31.0 // indirect
88+
golang.org/x/term v0.30.0 // indirect
89+
golang.org/x/text v0.23.0 // indirect
90+
golang.org/x/time v0.11.0 // indirect
91+
google.golang.org/protobuf v1.36.6 // indirect
9392
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9493
gopkg.in/inf.v0 v0.9.1 // indirect
9594
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
96-
gopkg.in/yaml.v2 v2.4.0 // indirect
9795
gopkg.in/yaml.v3 v3.0.1 // indirect
98-
k8s.io/apimachinery v0.31.0 // indirect
96+
k8s.io/apimachinery v0.32.3 // indirect
9997
k8s.io/apiserver v0.31.0 // indirect
100-
k8s.io/client-go v0.31.0 // indirect
98+
k8s.io/client-go v0.32.3 // indirect
10199
k8s.io/cluster-bootstrap v0.31.0 // indirect
102-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
103-
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
104-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
105-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
100+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
101+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
102+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
103+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
106104
sigs.k8s.io/yaml v1.4.0 // indirect
107105
)

0 commit comments

Comments
 (0)