Skip to content

Commit 76ed0e1

Browse files
Upgrade all versions
This commit upgrades many relevant versions that introduce breaking api changes. That is so that the packages of this repository don't clash in other repositories where this is imported. * updated klog * updated all kubernetes versions to 1.23 * updated go to 1.17
1 parent 1a5b7a8 commit 76ed0e1

38 files changed

+823
-338
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
*.out
1313

1414
bin/*
15+
16+
vendor

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.13-alpine as build
15+
FROM golang:1.17-alpine as build
1616
RUN apk --no-cache add ca-certificates make git gcc libc-dev
1717
WORKDIR /go/src/github.com/cruise-automation/rbacsync
1818
ADD . /go/src/github.com/cruise-automation/rbacsync

cmd/rbacsync/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
_ "k8s.io/client-go/plugin/pkg/client/auth"
3939
"k8s.io/client-go/rest"
4040
"k8s.io/client-go/tools/clientcmd"
41-
"k8s.io/klog"
41+
"k8s.io/klog/v2"
4242

4343
"github.com/cruise-automation/rbacsync/pkg/controller"
4444
clientset "github.com/cruise-automation/rbacsync/pkg/generated/clientset/versioned"

cmd/rbacsync/prometheus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package main
1818

1919
import (
2020
"k8s.io/client-go/util/workqueue"
21-
"k8s.io/klog"
21+
"k8s.io/klog/v2"
2222

2323
"github.com/prometheus/client_golang/prometheus"
2424
)

go.mod

+70-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,78 @@
11
module github.com/cruise-automation/rbacsync
22

3-
go 1.13
3+
go 1.17
44

55
require (
6-
github.com/Azure/go-autorest/autorest v0.9.4 // indirect
7-
github.com/Azure/go-autorest/autorest/adal v0.8.1 // indirect
86
github.com/davecgh/go-spew v1.1.1
9-
github.com/gophercloud/gophercloud v0.7.0 // indirect
10-
github.com/imdario/mergo v0.3.8 // indirect
117
github.com/pkg/errors v0.9.1
128
github.com/prometheus/client_golang v1.4.0
13-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
14-
google.golang.org/api v0.15.0
15-
gopkg.in/yaml.v2 v2.2.8
16-
k8s.io/api v0.17.2
17-
k8s.io/apimachinery v0.17.2
18-
k8s.io/client-go v0.17.0
19-
k8s.io/code-generator v0.17.2
20-
k8s.io/klog v1.0.0
21-
k8s.io/utils v0.0.0-20200124190032-861946025e34 // indirect
9+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
10+
google.golang.org/api v0.43.0
11+
gopkg.in/yaml.v2 v2.4.0
12+
k8s.io/api v0.23.3
13+
k8s.io/apimachinery v0.23.3
14+
k8s.io/client-go v0.23.3
15+
k8s.io/code-generator v0.23.3
16+
k8s.io/klog/v2 v2.40.1
17+
)
18+
19+
require (
20+
cloud.google.com/go v0.81.0 // indirect
21+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
22+
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
23+
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
24+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
25+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
26+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
27+
github.com/PuerkitoBio/purell v1.1.1 // indirect
28+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
29+
github.com/beorn7/perks v1.0.1 // indirect
30+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
31+
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
32+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
33+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
34+
github.com/go-logr/logr v1.2.2 // indirect
35+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
36+
github.com/go-openapi/jsonreference v0.19.6 // indirect
37+
github.com/go-openapi/swag v0.20.0 // indirect
38+
github.com/gogo/protobuf v1.3.2 // indirect
39+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
40+
github.com/golang/protobuf v1.5.2 // indirect
41+
github.com/google/go-cmp v0.5.5 // indirect
42+
github.com/google/gofuzz v1.1.0 // indirect
43+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
44+
github.com/googleapis/gnostic v0.5.5 // indirect
45+
github.com/imdario/mergo v0.3.8 // 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.7 // indirect
49+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
50+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
51+
github.com/modern-go/reflect2 v1.0.2 // indirect
52+
github.com/prometheus/client_model v0.2.0 // indirect
53+
github.com/prometheus/common v0.9.1 // indirect
54+
github.com/prometheus/procfs v0.0.8 // indirect
55+
github.com/spf13/pflag v1.0.5 // indirect
56+
go.opencensus.io v0.23.0 // indirect
57+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
58+
golang.org/x/mod v0.5.1 // indirect
59+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
60+
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
61+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
62+
golang.org/x/text v0.3.7 // indirect
63+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
64+
golang.org/x/tools v0.1.9 // indirect
65+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
66+
google.golang.org/appengine v1.6.7 // indirect
67+
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1 // indirect
68+
google.golang.org/grpc v1.36.1 // indirect
69+
google.golang.org/protobuf v1.27.1 // indirect
70+
gopkg.in/inf.v0 v0.9.1 // indirect
71+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
72+
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
73+
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
74+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
75+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
76+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
77+
sigs.k8s.io/yaml v1.3.0 // indirect
2278
)

0 commit comments

Comments
 (0)