Merge pull request #46 from sbezverk/csi_core_credentials

refactor provisioner to use new api objects

Author: childsb

Dockerfile

@@ -2,5 +2,5 @@ FROM alpine
 LABEL maintainers="Kubernetes Authors"
 LABEL description="CSI External Provisioner"
 
-COPY csi-provisioner csi-provisioner
+COPY ./bin/csi-provisioner csi-provisioner
 ENTRYPOINT ["/csi-provisioner"]

Dockerfile.builder

@@ -42,16 +42,16 @@
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.7.2"
+  version = "1.9.2"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  branch = "release-1.9"
+  branch = "master"
 
 [[constraint]]
   name = "k8s.io/client-go"
   version = "v6.0.0"
 
 [[constraint]]
   name = "k8s.io/api"
-  branch = "release-1.9"
+  branch = "master"

Gopkg.lock

@@ -12,36 +12,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-IMAGE = k8scsi/csi-provisioner
-VERSION = v0.2.0
+IMAGE_NAME = quay.io/k8scsi/csi-provisioner
+IMAGE_VERSION = v0.2.0
 
-container: build quick-container
-.PHONY: container
+ifdef V
+TESTARGS = -v -args -alsologtostderr -v 5
+else
+TESTARGS =
+endif
 
-clean:
-	rm -f external-provisioner
-	rm -rf _output
-.PHONY: clean
-
-format:
-	 gofmt -w -s ./
-.PHONY: format
+all: csi-provisioner
 
-deps:
-	dep ensure -update
-.PHONY: deps
+csi-provisioner:
+	mkdir -p bin
+	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o ./bin/csi-provisioner ./cmd/csi-provisioner 
 
-quick-container:
-	sudo ./hack/build-container.sh
-	@echo ""
-	@echo "Container quay.io/k8scsi/csi-provisioner:canary created"
-.PHONY: quick-container
+clean:
+	rm -rf bin deploy/docker/csi-provisioner
 
-provisioner:
-	mkdir -p _output
-	go build -i -o _output/csi-provisioner ./cmd/csi-provisioner/
-.PHONY: provisioner
+container: csi-provisioner
+	docker build -t $(IMAGE_NAME):$(IMAGE_VERSION) .
 
-all build: provisioner
+push: container
+	docker push $(IMAGE_NAME):$(IMAGE_VERSION)
 
-.PHONY: all build
+test:
+	go test `go list ./... | grep -v 'vendor'` $(TESTARGS)
+	go vet `go list ./... | grep -v vendor`