Skip to content

Commit cc123f4

Browse files
committed
Update kubernetes dependencies
1 parent 3ee0904 commit cc123f4

File tree

4 files changed

+76
-53
lines changed

4 files changed

+76
-53
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v3
2020
- uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.17
22+
go-version: 1.18
2323
- run: make ci-unit-test
2424

2525
integration-test:
@@ -28,17 +28,17 @@ jobs:
2828
needs: [check, unit-test]
2929
strategy:
3030
matrix:
31-
kubernetes: [1.17.17, 1.18.19, 1.19.11, 1.20.7, 1.21.1, 1.22.0, 1.23.0]
31+
kubernetes: [1.20.15, 1.21.12, 1.22.9, 1.23.6, 1.24.0]
3232
env:
33-
KIND_VERSION: v0.11.1
33+
KIND_VERSION: v0.14.0
3434
steps:
3535
- uses: actions/checkout@v3
3636
- uses: actions/setup-go@v3
3737
with:
38-
go-version: 1.17
38+
go-version: 1.18
3939
- name: Execute tests
4040
env:
41-
KIND_VERSION: v0.11.1
41+
KIND_VERSION: v0.14.0
4242
run: |
4343
# Get dependencies.
4444
echo "Getting dependencies..."

controller/leaderelection/leaderelection.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (r *runner) initResourceLock() error {
115115
recorder := eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: r.key, Host: id})
116116

117117
rl, err := resourcelock.New(
118-
resourcelock.ConfigMapsResourceLock,
118+
resourcelock.ConfigMapsLeasesResourceLock,
119119
r.namespace,
120120
r.key,
121121
r.k8scli.CoreV1(),

go.mod

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ require (
44
github.com/prometheus/client_golang v1.12.1
55
github.com/sirupsen/logrus v1.8.1
66
github.com/stretchr/testify v1.8.0
7-
k8s.io/api v0.23.1
8-
k8s.io/apimachinery v0.23.1
9-
k8s.io/client-go v0.23.1
7+
k8s.io/api v0.24.4
8+
k8s.io/apimachinery v0.24.4
9+
k8s.io/client-go v0.24.4
1010
)
1111

1212
require (
@@ -17,49 +17,58 @@ require (
1717
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
1818
github.com/Azure/go-autorest/logger v0.2.1 // indirect
1919
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
20+
github.com/PuerkitoBio/purell v1.1.1 // indirect
21+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2022
github.com/beorn7/perks v1.0.1 // indirect
2123
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2224
github.com/davecgh/go-spew v1.1.1 // indirect
25+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
2326
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2427
github.com/go-logr/logr v1.2.0 // indirect
28+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
29+
github.com/go-openapi/jsonreference v0.19.5 // indirect
30+
github.com/go-openapi/swag v0.19.14 // indirect
2531
github.com/gogo/protobuf v1.3.2 // indirect
2632
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
2733
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2834
github.com/golang/protobuf v1.5.2 // indirect
35+
github.com/google/gnostic v0.5.7-v3refs // indirect
2936
github.com/google/go-cmp v0.5.6 // indirect
3037
github.com/google/gofuzz v1.2.0 // indirect
3138
github.com/google/uuid v1.3.0 // indirect
32-
github.com/googleapis/gnostic v0.5.5 // indirect
3339
github.com/imdario/mergo v0.3.12 // indirect
40+
github.com/josharian/intern v1.0.0 // indirect
3441
github.com/json-iterator/go v1.1.12 // indirect
42+
github.com/mailru/easyjson v0.7.6 // indirect
3543
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
3644
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3745
github.com/modern-go/reflect2 v1.0.2 // indirect
46+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3847
github.com/pkg/errors v0.9.1 // indirect
3948
github.com/pmezard/go-difflib v1.0.0 // indirect
4049
github.com/prometheus/client_model v0.2.0 // indirect
4150
github.com/prometheus/common v0.32.1 // indirect
4251
github.com/prometheus/procfs v0.7.3 // indirect
4352
github.com/spf13/pflag v1.0.5 // indirect
4453
github.com/stretchr/objx v0.4.0 // indirect
45-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
46-
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
47-
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
48-
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
54+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
55+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
56+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
57+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
4958
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
5059
golang.org/x/text v0.3.7 // indirect
51-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
60+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
5261
google.golang.org/appengine v1.6.7 // indirect
5362
google.golang.org/protobuf v1.27.1 // indirect
5463
gopkg.in/inf.v0 v0.9.1 // indirect
5564
gopkg.in/yaml.v2 v2.4.0 // indirect
5665
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/klog/v2 v2.30.0 // indirect
58-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
59-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
60-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
61-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
66+
k8s.io/klog/v2 v2.60.1 // indirect
67+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
68+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
69+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
70+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
6271
sigs.k8s.io/yaml v1.3.0 // indirect
6372
)
6473

65-
go 1.17
74+
go 1.18

0 commit comments

Comments
 (0)