Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 8e8febb

Browse files
committed
Update to latest deps
1 parent 4cd22e0 commit 8e8febb

18 files changed

Lines changed: 152 additions & 86 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,5 @@ zz_generated.openapi.go
137137

138138
# binaries
139139
/openstack-cloud-controller-manager
140-
/cinder-flex-volume-driver
140+
/cinder-flex-volume-driver
141+
/cinder-provisioner

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ build: depend
3333
-ldflags "-X 'main.version=${VERSION}'" \
3434
-o openstack-cloud-controller-manager \
3535
cmd/openstack-cloud-controller-manager/main.go
36+
cd $(DEST) && CGO_ENABLED=0 GOOS=$(GOOS) go build \
37+
-ldflags "-X 'main.version=${VERSION}'" \
38+
-o cinder-provisioner \
39+
cmd/cinder-provisioner/main.go
3640
cd $(DEST) && CGO_ENABLED=0 GOOS=$(GOOS) go build \
3741
-ldflags "-X 'main.version=${VERSION}'" \
3842
-o cinder-flex-volume-driver \
@@ -104,7 +108,7 @@ install-distro-packages:
104108
tools/install-distro-packages.sh
105109

106110
clean:
107-
rm -rf .bindep openstack-cloud-controller-manager cinder-flex-volume-driver
111+
rm -rf .bindep openstack-cloud-controller-manager cinder-flex-volume-driver cinder-provisioner
108112

109113
realclean: clean
110114
rm -rf vendor

cmd/cinder-provisioner/cinder-provisioner.go renamed to cmd/cinder-provisioner/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package main
1919
import (
2020
"flag"
2121

22+
"git.openstack.org/openstack/openstack-cloud-controller-manager/pkg/volume/cinder/provisioner"
2223
"github.com/golang/glog"
2324
"github.com/kubernetes-incubator/external-storage/lib/controller"
24-
"github.com/kubernetes-incubator/external-storage/openstack/standalone-cinder/pkg/provisioner"
2525

2626
"k8s.io/apimachinery/pkg/util/wait"
2727
"k8s.io/client-go/kubernetes"

glide.lock

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

0 commit comments

Comments
 (0)