Skip to content

Commit c262320

Browse files
committed
fix build after k8s 1.18 was released
1 parent c4f841d commit c262320

File tree

3 files changed

+96
-35
lines changed

3 files changed

+96
-35
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ schemas: fmt vet openapischema
8888
# download controller-gen if necessary
8989
controller-gen:
9090
ifeq (, $(shell which controller-gen))
91-
go get sigs.k8s.io/controller-tools/cmd/[email protected].4
91+
go get sigs.k8s.io/controller-tools/cmd/[email protected].8
9292
CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
9393
else
9494
CONTROLLER_GEN=$(shell which controller-gen)

go.mod

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@ require (
77
github.com/aws/aws-sdk-go v1.25.18 // indirect
88
github.com/blang/semver v3.5.1+incompatible
99
github.com/chzyer/logex v1.1.11-0.20160617073814-96a4d311aa9b // indirect
10+
github.com/coreos/etcd v3.3.15+incompatible // indirect
1011
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
1112
github.com/dsnet/compress v0.0.1 // indirect
1213
github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
1314
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
1415
github.com/fatih/color v1.7.0
1516
github.com/frankban/quicktest v1.7.2 // indirect
16-
github.com/gin-gonic/gin v1.4.0
1717
github.com/gizak/termui/v3 v3.1.0
1818
github.com/go-openapi/spec v0.19.4 // indirect
1919
github.com/go-openapi/validate v0.19.5 // indirect
2020
github.com/go-redis/redis/v7 v7.2.0
2121
github.com/go-sql-driver/mysql v1.5.0
22+
github.com/gobuffalo/flect v0.2.0 // indirect
2223
github.com/golang/snappy v0.0.1 // indirect
2324
github.com/google/gofuzz v1.1.0
2425
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -37,12 +38,12 @@ require (
3738
github.com/onsi/gomega v1.9.0 // indirect
3839
github.com/pierrec/lz4 v2.2.6+incompatible // indirect
3940
github.com/pkg/errors v0.9.1
41+
github.com/prometheus/client_model v0.2.0 // indirect
4042
github.com/prometheus/procfs v0.0.5 // indirect
4143
github.com/spf13/cobra v0.0.5
4244
github.com/spf13/viper v1.4.0
4345
github.com/stretchr/testify v1.5.1
4446
github.com/tj/go-spin v1.1.0
45-
github.com/ugorji/go v1.1.7 // indirect
4647
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
4748
go.opencensus.io v0.22.0 // indirect
4849
go.undefinedlabs.com/scopeagent v0.1.7
@@ -55,11 +56,17 @@ require (
5556
k8s.io/apiextensions-apiserver v0.15.12-beta.0
5657
k8s.io/apimachinery v0.17.4
5758
k8s.io/apiserver v0.17.4 // indirect
58-
k8s.io/cli-runtime v0.17.0
59+
k8s.io/cli-runtime v0.17.4
5960
k8s.io/client-go v0.17.4
6061
k8s.io/code-generator v0.16.5-beta.1 // indirect
62+
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 // indirect
63+
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c // indirect
64+
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 // indirect
65+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7 // indirect
6166
sigs.k8s.io/controller-runtime v0.4.0
6267
sigs.k8s.io/controller-tools v0.2.4 // indirect
68+
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
69+
sigs.k8s.io/yaml v1.2.0 // indirect
6370
)
6471

6572
replace github.com/appscode/jsonpatch => github.com/gomodules/jsonpatch v2.0.1+incompatible

0 commit comments

Comments
 (0)