Skip to content

Commit

Permalink
Move nvidia-mig-manager code to cmd
Browse files Browse the repository at this point in the history
Signed-off-by: Evan Lezar <[email protected]>
  • Loading branch information
elezar committed Oct 20, 2023
1 parent 06a66e5 commit c39f1a5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@ BUILDIMAGE ?= $(IMAGE_NAME)-build:$(BUILDIMAGE_TAG)
EXAMPLES := $(patsubst ./examples/%/,%,$(sort $(dir $(wildcard ./examples/*/))))
EXAMPLE_TARGETS := $(patsubst %,example-%,$(EXAMPLES))

# The automatic detection of commands does not work in this case, were subcommands exist as
# folders under the cmd folder.
# CMDS := $(patsubst ./cmd/%/,%,$(sort $(dir $(wildcard ./cmd/*/))))
CMDS := nvidia-mig-parted
CMD_TARGETS := $(patsubst %,cmd-%,$(CMDS))
CMDS := $(patsubst ./cmd/%/,%,$(sort $(dir $(wildcard ./cmd/*/))))
CMD_TARGETS := $(patsubst %,cmd-%, $(CMDS))

CHECK_TARGETS := assert-fmt vet lint ineffassign misspell
MAKE_TARGETS := binaries build check fmt lint-internal test examples cmds coverage generate $(CHECK_TARGETS)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion deployments/gpu-operator/Dockerfile.ubi8
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ ARG TARGETARCH
WORKDIR /build
COPY . .

RUN mkdir /artifacts
ARG VERSION="N/A"
ARG GIT_COMMIT="unknown"
RUN make PREFIX=/artifacts cmds

RUN go build -o /artifacts/nvidia-mig-manager ./deployments/gpu-operator/
RUN cp ./deployments/gpu-operator/reconfigure-mig.sh /artifacts/reconfigure-mig.sh

RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && curl -o /artifacts/kubectl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${OS_ARCH}/kubectl";
Expand Down
2 changes: 1 addition & 1 deletion deployments/gpu-operator/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ ARG TARGETARCH
WORKDIR /build
COPY . .

RUN mkdir /artifacts
ARG VERSION="N/A"
ARG GIT_COMMIT="unknown"
RUN make PREFIX=/artifacts cmds

RUN go build -o /artifacts/nvidia-mig-manager ./deployments/gpu-operator/
RUN cp ./deployments/gpu-operator/reconfigure-mig.sh /artifacts/reconfigure-mig.sh

RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && curl -o /artifacts/kubectl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${OS_ARCH}/kubectl";
Expand Down

0 comments on commit c39f1a5

Please sign in to comment.