Skip to content

Commit

Permalink
Fix an issue that build params are not propagated
Browse files Browse the repository at this point in the history
  • Loading branch information
Huang-Wei committed Jul 29, 2024
1 parent 7e5b969 commit 604fb0f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ build: build-controller build-scheduler

.PHONY: build-controller
build-controller:
go build -ldflags '-w' -o bin/controller cmd/controller/controller.go
$(GO_BUILD_ENV) go build -ldflags '-X k8s.io/component-base/version.gitVersion=$(VERSION) -w' -o bin/controller cmd/controller/controller.go

.PHONY: build-scheduler
build-scheduler:
go build -ldflags '-X k8s.io/component-base/version.gitVersion=$(VERSION) -w' -o bin/kube-scheduler cmd/scheduler/main.go
$(GO_BUILD_ENV) go build -ldflags '-X k8s.io/component-base/version.gitVersion=$(VERSION) -w' -o bin/kube-scheduler cmd/scheduler/main.go

.PHONY: build-images
build-images:
Expand All @@ -73,8 +73,6 @@ build-images:
.PHONY: local-image
local-image: PLATFORMS="linux/$$(uname -m)"
local-image: RELEASE_VERSION="v0.0.0"
local-image: IMAGE="kube-scheduler:latest"
local-image: CONTROLLER_IMAGE="controller:latest"
local-image: REGISTRY="localhost:5000/scheduler-plugins"
local-image: EXTRA_ARGS="--load"
local-image: clean build-images
Expand Down
11 changes: 6 additions & 5 deletions build/controller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
# limitations under the License.
ARG GO_BASE_IMAGE
ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as go_builder
FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as builder

WORKDIR /go/src/sigs.k8s.io/scheduler-plugins
WORKDIR /workspace
COPY . .
ARG TARGETARCH
RUN make build-controller GO_BUILD_ENV='CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH}'

FROM --platform=${BUILDPLATFORM} $DISTROLESS_BASE_IMAGE

COPY --from=go_builder /go/src/sigs.k8s.io/scheduler-plugins/bin/controller /bin/controller
WORKDIR /
COPY --from=builder /workspace/bin/controller .
USER 65532:65532

WORKDIR /bin
CMD ["controller"]
ENTRYPOINT ["/controller"]
11 changes: 6 additions & 5 deletions build/scheduler/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
# limitations under the License.
ARG GO_BASE_IMAGE
ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as go-builder
FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as builder

WORKDIR /go/src/sigs.k8s.io/scheduler-plugins
WORKDIR /workspace
COPY . .
ARG TARGETARCH
RUN make build-scheduler GO_BUILD_ENV='CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH}'

FROM --platform=${BUILDPLATFORM} $DISTROLESS_BASE_IMAGE

COPY --from=go-builder /go/src/sigs.k8s.io/scheduler-plugins/bin/kube-scheduler /bin/kube-scheduler
WORKDIR /
COPY --from=builder /workspace/bin/kube-scheduler .
USER 65532:65532

WORKDIR /bin
CMD ["kube-scheduler"]
ENTRYPOINT ["/kube-scheduler"]

0 comments on commit 604fb0f

Please sign in to comment.