Skip to content

refactor provisioner to use new api objects #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 1, 2018
Merged

refactor provisioner to use new api objects #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
000c75b
vendor updates
sbezverk Feb 28, 2018
d90d5d0
refactor provisioner for CSI 0.2.0 spec
sbezverk Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
8 changes: 0 additions & 8 deletions Dockerfile.builder
View file
Open in desktop

This file was deleted.

104 changes: 31 additions & 73 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
46 changes: 20 additions & 26 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Loading