Skip to content

Commit 34964a7

Browse files
committed
Update kubernetes dependencies to 1.18 and add vendor folder back
1 parent 1c51cca commit 34964a7

File tree

2,309 files changed

+1639715
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,309 files changed

+1639715
-11
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414

1515

1616

17-
FROM golang:1.13.4-alpine3.10 as builder
17+
FROM golang:1.13.4 as builder
1818
WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
1919
ADD . .
20-
ARG TAG
21-
RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.vendorVersion='"${TAG:-latest}"' -extldflags "-static"' -o bin/gce-pd-csi-driver ./cmd/
20+
RUN make
2221

2322
# MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
2423
FROM gcr.io/google-containers/debian-base-amd64:v2.0.0 as base

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ DRIVERWINDOWSBINARY=${DRIVERBINARY}.exe
2727
all: gce-pd-driver
2828
gce-pd-driver:
2929
mkdir -p bin
30-
go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/${DRIVERBINARY} ./cmd/
30+
go build -mod=vendor -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/${DRIVERBINARY} ./cmd/
3131

3232
gce-pd-driver-windows:
3333
mkdir -p bin
34-
GOOS=windows go build -ldflags -X=main.vendorVersion=$(STAGINGVERSION) -o bin/${DRIVERWINDOWSBINARY} ./cmd/
34+
GOOS=windows go build -mod=vendor -ldflags -X=main.vendorVersion=$(STAGINGVERSION) -o bin/${DRIVERWINDOWSBINARY} ./cmd/
3535

3636
build-container:
3737
ifndef GCE_PD_CSI_STAGING_IMAGE
@@ -59,8 +59,8 @@ push-container: build-container
5959
gcloud docker -- push $(STAGINGIMAGE):$(STAGINGVERSION)
6060

6161
test-sanity: gce-pd-driver
62-
go test -v -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/sanity -run ^TestSanity$
62+
go test -mod=vendor --v -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/sanity -run ^TestSanity$
6363

6464
test-k8s-integration:
65-
go build -o bin/k8s-integration-test ./test/k8s-integration
65+
go build -mod=vendor -o bin/k8s-integration-test ./test/k8s-integration
6666

go.mod

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ go 1.13
44

55
require (
66
cloud.google.com/go v0.45.1
7-
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190612171043-2e19bb35a278
7+
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534
88
github.com/container-storage-interface/spec v1.2.0
99
github.com/golang/protobuf v1.3.4
1010
github.com/google/uuid v1.1.1
1111
github.com/hashicorp/go-multierror v1.0.0 // indirect
1212
github.com/kubernetes-csi/csi-proxy/client v0.0.0-20200330215040-9eff16441b2a
1313
github.com/kubernetes-csi/csi-test/v3 v3.0.0
14-
github.com/onsi/ginkgo v1.10.3
14+
github.com/onsi/ginkgo v1.11.0
1515
github.com/onsi/gomega v1.7.1
1616
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
1717
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056
@@ -21,9 +21,58 @@ require (
2121
google.golang.org/grpc v1.27.1
2222
gopkg.in/gcfg.v1 v1.2.3
2323
gopkg.in/warnings.v0 v0.1.2 // indirect
24-
k8s.io/apimachinery v0.17.1
24+
k8s.io/apimachinery v0.18.0
2525
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
2626
k8s.io/klog v1.0.0
27+
k8s.io/kubernetes v1.18.0
2728
k8s.io/test-infra v0.0.0-20200115230622-70a5174aa78d
28-
k8s.io/utils v0.0.0-20200124190032-861946025e34
29+
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
2930
)
31+
32+
replace k8s.io/api => k8s.io/api v0.18.0
33+
34+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
35+
36+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
37+
38+
replace k8s.io/apiserver => k8s.io/apiserver v0.18.0
39+
40+
replace k8s.io/client-go => k8s.io/client-go v0.18.0
41+
42+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
43+
44+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
45+
46+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
47+
48+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
49+
50+
replace k8s.io/code-generator => k8s.io/code-generator v0.18.0
51+
52+
replace k8s.io/component-base => k8s.io/component-base v0.18.0
53+
54+
replace k8s.io/cri-api => k8s.io/cri-api v0.18.0
55+
56+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
57+
58+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
59+
60+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
61+
62+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
63+
64+
replace k8s.io/kubectl => k8s.io/kubectl v0.18.0
65+
66+
replace k8s.io/kubelet => k8s.io/kubelet v0.18.0
67+
68+
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
69+
70+
replace k8s.io/metrics => k8s.io/metrics v0.18.0
71+
72+
replace k8s.io/node-api => k8s.io/node-api v0.18.0
73+
74+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
75+
76+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.0
77+
78+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.18.0

go.sum

Lines changed: 423 additions & 0 deletions
Large diffs are not rendered by default.

vendor/cloud.google.com/go/LICENSE

Lines changed: 202 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)