Skip to content

Commit 070e73f

Browse files
ankitkumr10ankitkumr10
committed
Merge pull request oracle#142 in OKE/oci-cloud-controller-manager from revert/OKE-13853 to internal
* commit 'ff0a6685ee2c3381e4326aa278a5280f165e07ef': Revert "Update vendor dependencies for k8s v1.17"
2 parents d5c50b6 + ff0a668 commit 070e73f

File tree

1,844 files changed

+48987
-145246
lines changed

Some content is hidden

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

1,844 files changed

+48987
-145246
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM iad.ocir.io/odx-oke/oke/golang-buildbox:1.13.15-fips as builder
2+
FROM iad.ocir.io/odx-oke/oke/golang-buildbox:1.12.7-fips as builder
33

44
ARG COMPONENT
55

‎Dockerfile_arm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM iad.ocir.io/odx-oke/oke/golang-buildbox:1.13.15-fips as builder
1+
FROM iad.ocir.io/odx-oke/oke/golang-buildbox:1.12.7-fips as builder
22

33
ARG COMPONENT
44

‎Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ build-dirs:
8989
.PHONY: build
9090
build: build-dirs
9191
@for component in $(COMPONENT); do \
92-
GOOS=$(GOOS) GOARCH=$(ARCH) CGO_ENABLED=1 go build -mod vendor -o dist/$$component -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/$$component ; \
92+
GOOS=$(GOOS) GOARCH=$(ARCH) CGO_ENABLED=1 go build -o dist/$$component -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/$$component ; \
9393
done
9494

9595
.PHONY: build-arm
9696
build-arm: build-dirs
97-
GOOS=$(GOOS) GOARCH=arm64 CGO_ENABLED=0 go build -mod vendor -o dist/arm/oci-csi-node-driver -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/oci-csi-node-driver ;
98-
GOOS=$(GOOS) GOARCH=arm64 CGO_ENABLED=0 go build -mod vendor -o dist/arm/oci-flexvolume-driver -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/oci-flexvolume-driver ; \
97+
GOOS=$(GOOS) GOARCH=arm64 CGO_ENABLED=0 go build -o dist/arm/oci-csi-node-driver -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/oci-csi-node-driver ;
98+
GOOS=$(GOOS) GOARCH=arm64 CGO_ENABLED=0 go build -o dist/arm/oci-flexvolume-driver -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/oci-flexvolume-driver ; \
9999

100100
.PHONY: manifests
101101
manifests: build-dirs
@@ -114,8 +114,8 @@ test:
114114

115115
.PHONY: coverage
116116
coverage: test
117-
GO111MODULE=off go tool cover -html=coverage.out -o coverage.html
118-
GO111MODULE=off go tool cover -func=coverage.out > coverage.txt
117+
go tool cover -html=coverage.out -o coverage.html
118+
go tool cover -func=coverage.out > coverage.txt
119119

120120
# Run the canary tests - in single run mode.
121121
.PHONY: canary-run-once
@@ -180,9 +180,9 @@ build-local: build-dirs
180180
-v $(PWD):$(DOCKER_REPO_ROOT) \
181181
-e COMPONENT="$(COMPONENT)" \
182182
-e GOPATH=/go/ \
183-
iad.ocir.io/odx-oke/oke/golang-buildbox:1.13.15-fips /bin/bash -c \
183+
iad.ocir.io/odx-oke/oke/golang-buildbox:1.12.7-fips /bin/bash -c \
184184
'for component in ${COMPONENT}; do \
185-
echo building $$component && GOOS=$(GOOS) GOARCH=$(ARCH) CGO_ENABLED=1 go build -mod vendor -o dist/$$component -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/$$component ; \
185+
echo building $$component && GOOS=$(GOOS) GOARCH=$(ARCH) CGO_ENABLED=1 go build -o dist/$$component -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/$$component ; \
186186
done'
187187

188188
.PHONY: run-ccm-e2e-tests-local

‎cmd/cloud-provider-oci/app/cloud_provider_oci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
cloudControllerManager "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
3939
cloudControllerManagerConfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
4040
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
41-
"k8s.io/component-base/version/verflag"
41+
"k8s.io/kubernetes/pkg/version/verflag"
4242

4343
csicontroller "github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-controller-driver/csi-controller"
4444
"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-controller-driver/csioptions"

‎cmd/oci-cloud-controller-manager/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"go.uber.org/zap"
2828
cliflag "k8s.io/component-base/cli/flag"
2929
"k8s.io/component-base/logs"
30-
_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
31-
_ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
3230
"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
31+
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
32+
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
3333
)
3434

3535
var version string

‎cmd/oci-csi-node-driver/nodedriverregistrar/node_register.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@ package nodedriverregistrar
1616

1717
import (
1818
"fmt"
19-
"net"
20-
"os"
21-
"runtime"
22-
2319
"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-node-driver/nodedriveroptions"
2420
"golang.org/x/sys/unix"
2521
"google.golang.org/grpc"
2622
"k8s.io/klog"
27-
registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1"
23+
registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1"
24+
"net"
25+
"os"
26+
"runtime"
2827
)
2928

3029
//nodeRegister is the main function to start node register

‎cmd/oci-csi-node-driver/nodedriverregistrar/nodedriverregistrar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-node-driver/nodedriveroptions"
2626

2727
"k8s.io/klog"
28-
registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1"
28+
registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1"
2929
)
3030

3131
const (

‎docs/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ using [`go mod`][2].
55

66
## Setup
77
1. Ensure you have the aforementioned development tools installed as well as
8-
as well as the release 1.13.x of [Go][3].
8+
as well as the release 1.13< of [Go][3].
99

1010
2. Clone the repo under `/src/github.com/oracle/`
1111

‎go.mod

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ replace (
77
github.com/oracle/oci-go-sdk/v31 => bitbucket.oci.oraclecorp.com/sdk/oci-go-sdk/v31 v31.0.0-20201215183620-aed686bb60a8
88
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.4
99
google.golang.org/grpc => google.golang.org/grpc v1.26.0
10-
k8s.io/api => k8s.io/api v0.17.13
11-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.13
12-
k8s.io/apimachinery => k8s.io/apimachinery v0.17.13
13-
k8s.io/apiserver => k8s.io/apiserver v0.17.13
10+
k8s.io/api => k8s.io/api v0.16.4
11+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.4
12+
k8s.io/apimachinery => k8s.io/apimachinery v0.16.4
13+
k8s.io/apiserver => k8s.io/apiserver v0.16.4
1414
k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.4
15-
k8s.io/client-go => k8s.io/client-go v0.17.13
16-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.13
15+
k8s.io/client-go => k8s.io/client-go v0.16.4
16+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.4
1717
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.4
1818
k8s.io/code-generator => k8s.io/code-generator v0.16.4
19-
k8s.io/component-base => k8s.io/component-base v0.17.13
19+
k8s.io/component-base => k8s.io/component-base v0.17.0
2020
k8s.io/cri-api => k8s.io/cri-api v0.16.4
2121
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.0
2222
k8s.io/klog => github.com/mrunalpagnis/klog v0.0.0-00000000000000-ec66c0a95a3fe542357d0366ad25f152cce66b8b
2323
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.4
24-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.13
25-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.13
24+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.4
25+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.4
2626
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.4
27-
k8s.io/kubectl => k8s.io/kubectl v0.17.13
28-
k8s.io/kubelet => k8s.io/kubelet v0.17.13
27+
k8s.io/kubectl => k8s.io/kubectl v0.16.4
28+
k8s.io/kubelet => k8s.io/kubelet v0.16.4
2929
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.4
3030
k8s.io/metrics => k8s.io/metrics v0.16.4
3131
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.4
@@ -42,40 +42,41 @@ require (
4242
bitbucket.oci.oraclecorp.com/oke/oke-common v1.0.1-0.20201218050159-057951da132b
4343
github.com/NYTimes/gziphandler v1.0.1 // indirect
4444
github.com/container-storage-interface/spec v1.2.0
45-
github.com/golang/protobuf v1.4.3
45+
github.com/golang/protobuf v1.4.2
4646
github.com/kubernetes-csi/csi-lib-utils v0.7.1
4747
github.com/kubernetes-csi/external-attacher v2.1.0+incompatible
4848
github.com/kubernetes-csi/external-provisioner v1.6.1
4949
github.com/kubernetes-csi/external-snapshotter v1.2.1-0.20191220180133-bba358438aee
50+
github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect
5051
github.com/onsi/ginkgo v1.14.0
5152
github.com/onsi/gomega v1.10.1
52-
github.com/oracle/oci-go-sdk v24.3.0+incompatible
5353
github.com/oracle/oci-go-sdk/v31 v31.0.0-00010101000000-000000000000
5454
github.com/pkg/errors v0.9.1
55-
github.com/prometheus/client_golang v1.7.1
56-
github.com/spf13/cobra v1.1.1
55+
github.com/prometheus/client_golang v1.4.1
56+
github.com/spf13/cobra v1.0.0
5757
github.com/spf13/pflag v1.0.5
58-
github.com/spf13/viper v1.7.0
58+
github.com/spf13/viper v1.6.3
5959
go.uber.org/multierr v1.6.0 // indirect
6060
go.uber.org/zap v1.16.0
61-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
62-
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f
61+
golang.org/x/net v0.0.0-20200707034311-ab3426394381
62+
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299
63+
google.golang.org/appengine v1.6.2 // indirect
6364
google.golang.org/grpc v1.29.0
65+
gopkg.in/inf.v0 v0.9.1 // indirect
6466
gopkg.in/natefinch/lumberjack.v2 v2.0.0
6567
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
6668
gopkg.in/yaml.v2 v2.3.0
6769
k8s.io/api v0.17.15
6870
k8s.io/apimachinery v0.17.15
69-
k8s.io/apiserver v0.17.13
71+
k8s.io/apiserver v0.17.0
7072
k8s.io/client-go v11.0.0+incompatible
7173
k8s.io/cloud-provider v0.17.0
72-
k8s.io/component-base v0.17.13
74+
k8s.io/component-base v0.17.0
7375
k8s.io/csi-translation-lib v0.17.0
7476
k8s.io/klog v1.0.0
7577
k8s.io/kubectl v1.16.4 // indirect
76-
k8s.io/kubelet v0.0.0
77-
k8s.io/kubernetes v1.17.13
78-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
78+
k8s.io/kubernetes v1.16.0
79+
k8s.io/utils v0.0.0-20200124190032-861946025e34
7980
sigs.k8s.io/sig-storage-lib-external-provisioner v4.1.0+incompatible
8081
sigs.k8s.io/sig-storage-lib-external-provisioner/v5 v5.0.0
8182
)

0 commit comments

Comments
 (0)