Skip to content

Commit e6e727b

Browse files
authored
Merge pull request #101 from jtherin/bump1.24
chore: bump client to 1.24 and go 1.17
2 parents 248bd43 + b0ae0ea commit e6e727b

File tree

5 files changed

+530
-157
lines changed

5 files changed

+530
-157
lines changed

.github/workflows/pull-request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
unit-test:
88
strategy:
99
matrix:
10-
go-version: [1.15.x]
10+
go-version: [1.17.x]
1111
platform: [ubuntu-latest]
1212
runs-on: ${{ matrix.platform }}
1313
steps:
@@ -24,7 +24,7 @@ jobs:
2424
build-test:
2525
strategy:
2626
matrix:
27-
go-version: [1.15.x]
27+
go-version: [1.17.x]
2828
platform: [ubuntu-latest]
2929
arch: [386, amd64, arm, arm64]
3030
runs-on: ${{ matrix.platform }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.15.0-alpine as builder
1+
FROM golang:1.17.0-alpine as builder
22

33
RUN apk update && apk add --no-cache git ca-certificates && update-ca-certificates
44

docs/development-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The CCM has a simple build system based on make.
44

55
## Requirements
66

7-
- Go (1.15+)
7+
- Go (1.17+)
88
- make
99
- docker
1010

go.mod

Lines changed: 95 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,102 @@
11
module github.com/scaleway/scaleway-cloud-controller-manager
22

3-
go 1.15
3+
go 1.17
44

55
require (
66
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9
77
github.com/spf13/pflag v1.0.5
8-
k8s.io/api v0.21.0
9-
k8s.io/apimachinery v0.21.0
10-
k8s.io/client-go v0.21.0
11-
k8s.io/cloud-provider v0.21.0
12-
k8s.io/component-base v0.21.0
13-
k8s.io/klog/v2 v2.8.0
8+
k8s.io/api v0.24.0
9+
k8s.io/apimachinery v0.24.0
10+
k8s.io/client-go v0.24.0
11+
k8s.io/cloud-provider v0.24.0
12+
k8s.io/component-base v0.24.0
13+
k8s.io/klog/v2 v2.60.1
14+
)
15+
16+
require (
17+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
18+
github.com/NYTimes/gziphandler v1.1.1 // indirect
19+
github.com/PuerkitoBio/purell v1.1.1 // indirect
20+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
21+
github.com/beorn7/perks v1.0.1 // indirect
22+
github.com/blang/semver/v4 v4.0.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
24+
github.com/coreos/go-semver v0.3.0 // indirect
25+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
26+
github.com/davecgh/go-spew v1.1.1 // indirect
27+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
28+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
29+
github.com/felixge/httpsnoop v1.0.1 // indirect
30+
github.com/fsnotify/fsnotify v1.4.9 // indirect
31+
github.com/go-logr/logr v1.2.0 // indirect
32+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
33+
github.com/go-openapi/jsonreference v0.19.5 // indirect
34+
github.com/go-openapi/swag v0.19.14 // indirect
35+
github.com/gogo/protobuf v1.3.2 // indirect
36+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
37+
github.com/golang/protobuf v1.5.2 // indirect
38+
github.com/google/gnostic v0.5.7-v3refs // indirect
39+
github.com/google/go-cmp v0.5.5 // indirect
40+
github.com/google/gofuzz v1.1.0 // indirect
41+
github.com/google/uuid v1.1.2 // indirect
42+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
43+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
44+
github.com/imdario/mergo v0.3.5 // indirect
45+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
46+
github.com/josharian/intern v1.0.0 // indirect
47+
github.com/json-iterator/go v1.1.12 // indirect
48+
github.com/mailru/easyjson v0.7.6 // indirect
49+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
50+
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
51+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
52+
github.com/modern-go/reflect2 v1.0.2 // indirect
53+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
54+
github.com/pkg/errors v0.9.1 // indirect
55+
github.com/prometheus/client_golang v1.12.1 // indirect
56+
github.com/prometheus/client_model v0.2.0 // indirect
57+
github.com/prometheus/common v0.32.1 // indirect
58+
github.com/prometheus/procfs v0.7.3 // indirect
59+
github.com/spf13/cobra v1.4.0 // indirect
60+
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
61+
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
62+
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
63+
go.opentelemetry.io/contrib v0.20.0 // indirect
64+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
65+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
66+
go.opentelemetry.io/otel v0.20.0 // indirect
67+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
68+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
69+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
70+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
71+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
72+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
73+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
74+
go.uber.org/atomic v1.7.0 // indirect
75+
go.uber.org/multierr v1.6.0 // indirect
76+
go.uber.org/zap v1.19.0 // indirect
77+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
78+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
79+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
80+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
81+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
82+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
83+
golang.org/x/text v0.3.7 // indirect
84+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
85+
google.golang.org/appengine v1.6.7 // indirect
86+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
87+
google.golang.org/grpc v1.40.0 // indirect
88+
google.golang.org/protobuf v1.27.1 // indirect
89+
gopkg.in/inf.v0 v0.9.1 // indirect
90+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
91+
gopkg.in/yaml.v2 v2.4.0 // indirect
92+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
93+
k8s.io/apiserver v0.24.0 // indirect
94+
k8s.io/component-helpers v0.24.0 // indirect
95+
k8s.io/controller-manager v0.24.0 // indirect
96+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
97+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
98+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
99+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
100+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
101+
sigs.k8s.io/yaml v1.2.0 // indirect
14102
)

0 commit comments

Comments
 (0)