Skip to content

Commit 2959fe3

Browse files
committed
Update dependencies to Kubernetes 1.30
Signed-off-by: Aurel Canciu <[email protected]>
1 parent 9a0c6e7 commit 2959fe3

5 files changed

Lines changed: 68 additions & 116 deletions

File tree

Makefile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,18 @@ vet:
1212
go vet ./...
1313

1414
fmt:
15-
go mod tidy
16-
gofmt -l -s -w ./
17-
goimports -l -w ./
18-
19-
test-fmt:
20-
gofmt -l -s ./ | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
21-
goimports -l ./ | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
15+
go fmt ./...
2216

2317
codegen:
2418
./hack/update-codegen.sh
2519

2620
test-codegen:
2721
./hack/verify-codegen.sh
2822

29-
test: test-fmt test-codegen
23+
test: fmt test-codegen
3024
go test ./...
3125

32-
test-coverage: test-fmt test-codegen
26+
test-coverage: fmt test-codegen
3327
go test -coverprofile cover.out ./...
3428
go tool cover -html=cover.out
3529
rm cover.out

cmd/flagger/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ func startLeaderElection(ctx context.Context, run func(), ns string, kubeClient
327327
id = id + "_" + string(uuid.NewUUID())
328328

329329
lock, err := resourcelock.New(
330-
resourcelock.ConfigMapsLeasesResourceLock,
330+
resourcelock.LeasesResourceLock,
331331
ns,
332332
configMapName,
333333
kubeClient.CoreV1(),

go.mod

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/fluxcd/flagger
22

3-
go 1.22
3+
go 1.22.0
4+
5+
toolchain go1.22.2
46

57
require (
68
cloud.google.com/go/monitoring v1.18.1
@@ -20,10 +22,10 @@ require (
2022
google.golang.org/grpc v1.62.1
2123
google.golang.org/protobuf v1.33.0
2224
gopkg.in/h2non/gock.v1 v1.1.2
23-
k8s.io/api v0.27.11
24-
k8s.io/apimachinery v0.27.11
25-
k8s.io/client-go v0.27.11
26-
k8s.io/code-generator v0.27.11
25+
k8s.io/api v0.30.0
26+
k8s.io/apimachinery v0.30.0
27+
k8s.io/client-go v0.30.0
28+
k8s.io/code-generator v0.30.0
2729
k8s.io/klog/v2 v2.120.1
2830
)
2931

@@ -33,7 +35,7 @@ require (
3335
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
3436
github.com/beorn7/perks v1.0.1 // indirect
3537
github.com/cespare/xxhash/v2 v2.2.0 // indirect
36-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
38+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3739
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3840
github.com/go-logr/logr v1.4.1 // indirect
3941
github.com/go-logr/stdr v1.2.2 // indirect
@@ -43,7 +45,7 @@ require (
4345
github.com/gogo/protobuf v1.3.2 // indirect
4446
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4547
github.com/golang/protobuf v1.5.4 // indirect
46-
github.com/google/gnostic v0.6.9 // indirect
48+
github.com/google/gnostic-models v0.6.8 // indirect
4749
github.com/google/gofuzz v1.2.0 // indirect
4850
github.com/google/s2a-go v0.1.7 // indirect
4951
github.com/google/uuid v1.6.0 // indirect
@@ -73,25 +75,25 @@ require (
7375
go.opentelemetry.io/otel/trace v1.24.0 // indirect
7476
go.uber.org/multierr v1.11.0 // indirect
7577
golang.org/x/crypto v0.21.0 // indirect
76-
golang.org/x/mod v0.14.0 // indirect
78+
golang.org/x/mod v0.15.0 // indirect
7779
golang.org/x/net v0.23.0 // indirect
7880
golang.org/x/oauth2 v0.18.0 // indirect
7981
golang.org/x/sync v0.6.0 // indirect
8082
golang.org/x/sys v0.18.0 // indirect
8183
golang.org/x/term v0.18.0 // indirect
8284
golang.org/x/text v0.14.0 // indirect
8385
golang.org/x/time v0.5.0 // indirect
84-
golang.org/x/tools v0.16.1 // indirect
86+
golang.org/x/tools v0.18.0 // indirect
8587
google.golang.org/appengine v1.6.8 // indirect
8688
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
8789
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
8890
gopkg.in/inf.v0 v0.9.1 // indirect
8991
gopkg.in/yaml.v2 v2.4.0 // indirect
9092
gopkg.in/yaml.v3 v3.0.1 // indirect
91-
k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4 // indirect
92-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
93-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
93+
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
94+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
95+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
9496
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
95-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
97+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
9698
sigs.k8s.io/yaml v1.3.0 // indirect
9799
)

0 commit comments

Comments
 (0)