Skip to content

Commit 6e38ce0

Browse files
jayasheelankumarl-technicore
jayasheelankumar
authored and
l-technicore
committed
Upgrading CCM to 1.23
1 parent 6969d66 commit 6e38ce0

File tree

2 files changed

+124
-9
lines changed

2 files changed

+124
-9
lines changed

‎Makefile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,19 @@ check: gofmt govet golint
7777
.PHONY: build-dirs
7878
build-dirs:
7979
@mkdir -p dist/
80+
@mkdir -p dist/arm/
8081

8182
.PHONY: build
8283
build: build-dirs
8384
@for component in $(COMPONENT); do \
84-
GOOS=$(GOOS) GOARCH=$(ARCH) CGO_ENABLED=0 go build -o dist/$$component -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/$$component ; \
85+
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 ; \
8586
done
8687

88+
.PHONY: build-arm
89+
build-arm: build-dirs
90+
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 ;
91+
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 ; \
92+
8793
.PHONY: manifests
8894
manifests: build-dirs
8995
@mkdir -p ${RELEASE}
@@ -100,6 +106,11 @@ vendor:
100106
test:
101107
@./hack/test.sh $(SRC_DIRS)
102108

109+
.PHONY: coverage
110+
coverage: test
111+
GO111MODULE=off go tool cover -html=coverage.out -o coverage.html
112+
GO111MODULE=off go tool cover -func=coverage.out > coverage.txt
113+
103114
# Run the canary tests - in single run mode.
104115
.PHONY: canary-run-once
105116
canary-run-once:
@@ -190,7 +201,7 @@ test-local: build-dirs
190201
-v $(PWD):$(DOCKER_REPO_ROOT) \
191202
-e COMPONENT="$(COMPONENT)" \
192203
-e GOPATH=/go/ \
193-
odo-docker-signed-local.artifactory.oci.oraclecorp.com/odx-oke/oke/k8-manager-base:go1.16.1-1.0.9 \
204+
odo-docker-signed-local.artifactory.oci.oraclecorp.com/odx-oke/oke/k8-manager-base:go1.17.7-1.0.10 \
194205
make coverage image
195206

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

‎go.mod

Lines changed: 111 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ require (
4747
github.com/oracle/oci-go-sdk/v50 v50.1.0
4848
github.com/pkg/errors v0.9.1
4949
github.com/prometheus/client_golang v1.11.0
50-
github.com/spf13/cobra v1.1.3 // indirect
50+
github.com/spf13/cobra v1.2.1
5151
github.com/spf13/pflag v1.0.5
52-
github.com/spf13/viper v1.7.0
53-
go.uber.org/zap v1.17.0
52+
github.com/spf13/viper v1.8.1
53+
go.uber.org/zap v1.19.0
5454
golang.org/x/net v0.0.0-20211209124913-491a49abca63
55-
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
56-
google.golang.org/grpc v1.38.0
55+
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e
56+
google.golang.org/grpc v1.40.0
5757
gopkg.in/natefinch/lumberjack.v2 v2.0.0
5858
gopkg.in/yaml.v2 v2.4.0
5959
k8s.io/api v0.23.4
@@ -65,9 +65,113 @@ require (
6565
k8s.io/component-helpers v0.23.4
6666
k8s.io/csi-translation-lib v0.23.4
6767
k8s.io/klog v1.0.0
68-
k8s.io/klog/v2 v2.9.0
68+
k8s.io/klog/v2 v2.30.0
6969
k8s.io/kubelet v0.23.4
7070
k8s.io/kubernetes v1.23.4
71-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
71+
k8s.io/utils v0.0.0-20211116205334-6203023598ed
7272
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
7373
)
74+
75+
require (
76+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
77+
github.com/NYTimes/gziphandler v1.1.1 // indirect
78+
github.com/PuerkitoBio/purell v1.1.1 // indirect
79+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
80+
github.com/beorn7/perks v1.0.1 // indirect
81+
github.com/blang/semver v3.5.1+incompatible // indirect
82+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
83+
github.com/coreos/go-semver v0.3.0 // indirect
84+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
85+
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
86+
github.com/davecgh/go-spew v1.1.1 // indirect
87+
github.com/docker/distribution v2.7.1+incompatible // indirect
88+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
89+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
90+
github.com/felixge/httpsnoop v1.0.1 // indirect
91+
github.com/fsnotify/fsnotify v1.4.9 // indirect
92+
github.com/go-kit/kit v0.10.0 // indirect
93+
github.com/go-logr/logr v1.2.0 // indirect
94+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
95+
github.com/go-openapi/jsonreference v0.19.5 // indirect
96+
github.com/go-openapi/swag v0.19.14 // indirect
97+
github.com/gogo/protobuf v1.3.2 // indirect
98+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
99+
github.com/google/go-cmp v0.5.5 // indirect
100+
github.com/google/go-querystring v1.0.0 // indirect
101+
github.com/google/gofuzz v1.1.0 // indirect
102+
github.com/google/uuid v1.1.2 // indirect
103+
github.com/googleapis/gnostic v0.5.5 // indirect
104+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
105+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
106+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
107+
github.com/hashicorp/hcl v1.0.0 // indirect
108+
github.com/imdario/mergo v0.3.9 // indirect
109+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
110+
github.com/josharian/intern v1.0.0 // indirect
111+
github.com/json-iterator/go v1.1.12 // indirect
112+
github.com/magiconair/properties v1.8.5 // indirect
113+
github.com/mailru/easyjson v0.7.6 // indirect
114+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
115+
github.com/miekg/dns v1.1.29 // indirect
116+
github.com/mitchellh/mapstructure v1.4.1 // indirect
117+
github.com/moby/spdystream v0.2.0 // indirect
118+
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
119+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
120+
github.com/modern-go/reflect2 v1.0.2 // indirect
121+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
122+
github.com/nxadm/tail v1.4.4 // indirect
123+
github.com/opencontainers/go-digest v1.0.0 // indirect
124+
github.com/opencontainers/runc v1.0.2 // indirect
125+
github.com/pelletier/go-toml v1.9.3 // indirect
126+
github.com/prometheus/client_model v0.2.0 // indirect
127+
github.com/prometheus/common v0.28.0 // indirect
128+
github.com/prometheus/procfs v0.6.0 // indirect
129+
github.com/sirupsen/logrus v1.8.1 // indirect
130+
github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b // indirect
131+
github.com/spf13/afero v1.6.0 // indirect
132+
github.com/spf13/cast v1.3.1 // indirect
133+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
134+
github.com/subosito/gotenv v1.2.0 // indirect
135+
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
136+
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
137+
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
138+
go.opentelemetry.io/contrib v0.20.0 // indirect
139+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
140+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
141+
go.opentelemetry.io/otel v0.20.0 // indirect
142+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
143+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
144+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
145+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
146+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
147+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
148+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
149+
go.uber.org/atomic v1.7.0 // indirect
150+
go.uber.org/multierr v1.6.0 // indirect
151+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
152+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
153+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
154+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
155+
golang.org/x/text v0.3.7 // indirect
156+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
157+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
158+
google.golang.org/appengine v1.6.7 // indirect
159+
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
160+
google.golang.org/protobuf v1.27.1 // indirect
161+
gopkg.in/inf.v0 v0.9.1 // indirect
162+
gopkg.in/ini.v1 v1.62.0 // indirect
163+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
164+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
165+
k8s.io/controller-manager v0.23.4 // indirect
166+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
167+
k8s.io/kube-scheduler v0.0.0 // indirect
168+
k8s.io/kubectl v0.0.0 // indirect
169+
oracle.com/oci/httpsigner v0.0.0-20190320175442-e8cb27ebf440 // indirect
170+
oracle.com/oci/ociauthz v0.0.0-20200515161105-5b1e37d2dc95 // indirect
171+
oracle.com/oci/tagging v0.0.0-20190321202046-20a2e48911da // indirect
172+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 // indirect
173+
sigs.k8s.io/controller-runtime v0.6.2 // indirect
174+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
175+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
176+
sigs.k8s.io/yaml v1.2.0 // indirect
177+
)

0 commit comments

Comments
 (0)