Skip to content

Commit d4f1dbb

Browse files
authored
Merge pull request #150 from Prajyot-Parab/update
Integrate NodeUpdate controller with csi-driver
2 parents e8acc14 + 71569d4 commit d4f1dbb

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
FROM golang:1.17 AS builder
1616
WORKDIR /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver
1717
ADD . .
18-
RUN make driver
18+
RUN make driver node-update-controller
1919

2020
# debian base image
2121
FROM k8s.gcr.io/build-image/debian-base:v2.1.3 AS debian-base
2222
RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs bash multipath-tools sg3-utils
23-
COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver/bin/ibm-powervs-block-csi-driver /ibm-powervs-block-csi-driver
23+
COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver/bin/* /
2424
ENTRYPOINT ["/ibm-powervs-block-csi-driver"]
2525

2626
# centos base image
2727
FROM quay.io/centos/centos:stream8 AS centos-base
2828
RUN yum install -y util-linux nfs-utils e2fsprogs xfsprogs ca-certificates && yum clean all && rm -rf /var/cache/yum
29-
COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver/bin/ibm-powervs-block-csi-driver /ibm-powervs-block-csi-driver
29+
COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver/bin/* /
3030
ENTRYPOINT ["/ibm-powervs-block-csi-driver"]

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ bin:
3535
driver: | bin
3636
CGO_ENABLED=0 go build -ldflags ${LDFLAGS} -o bin/ibm-powervs-block-csi-driver ./cmd/
3737

38+
.PHONY: node-update-controller
39+
node-update-controller: | bin
40+
CGO_ENABLED=0 go build -ldflags ${LDFLAGS} -o bin/node-update-controller ./adhoc-controllers/
41+
3842
.PHONY: test
3943
test:
4044
go test -v -race ./cmd/... ./pkg/...

0 commit comments

Comments
 (0)