Merge pull request #773 from Huang-Wei/BUILDPLATFORM

Author: Huang-Wei

Makefile

@@ -13,8 +13,6 @@
 # limitations under the License.
 
 GO_VERSION := $(shell awk '/^go /{print $$2}' go.mod|head -n1)
-COMMONENVVAR=GOOS=$(shell uname -s | tr A-Z a-z)
-BUILDENVVAR=CGO_ENABLED=0
 INTEGTESTENVVAR=SCHED_PLUGINS_TEST_VERBOSE=1
 
 # Manage platform and builders
@@ -26,10 +24,10 @@ else
 	ALL_FLAG=
 endif
 
-# RELEASE_REGISTRY is the container registry to push
+# REGISTRY is the container registry to push
 # into. The default is to push to the staging
 # registry, not production(registry.k8s.io).
-RELEASE_REGISTRY?=gcr.io/k8s-staging-scheduler-plugins
+REGISTRY?=gcr.io/k8s-staging-scheduler-plugins
 RELEASE_VERSION?=v$(shell date +%Y%m%d)-$(shell git describe --tags --match "v*")
 RELEASE_IMAGE:=kube-scheduler:$(RELEASE_VERSION)
 RELEASE_CONTROLLER_IMAGE:=controller:$(RELEASE_VERSION)
@@ -53,18 +51,18 @@ build: build-controller build-scheduler
 
 .PHONY: build-controller
 build-controller:
-	$(COMMONENVVAR) $(BUILDENVVAR) go build -ldflags '-w' -o bin/controller cmd/controller/controller.go
+	go build -ldflags '-w' -o bin/controller cmd/controller/controller.go
 
 .PHONY: build-scheduler
 build-scheduler:
-	$(COMMONENVVAR) $(BUILDENVVAR) go build -ldflags '-X k8s.io/component-base/version.gitVersion=$(VERSION) -w' -o bin/kube-scheduler cmd/scheduler/main.go
+	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:
 	BUILDER=$(BUILDER) \
 	PLATFORMS=$(PLATFORMS) \
 	RELEASE_VERSION=$(RELEASE_VERSION) \
-	REGISTRY=$(RELEASE_REGISTRY) \
+	REGISTRY=$(REGISTRY) \
 	IMAGE=$(RELEASE_IMAGE) \
 	CONTROLLER_IMAGE=$(RELEASE_CONTROLLER_IMAGE) \
 	GO_BASE_IMAGE=$(GO_BASE_IMAGE) \
@@ -78,6 +76,7 @@ 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
 
 .PHONY: release-images

build/controller/Dockerfile

@@ -13,13 +13,14 @@
 # limitations under the License.
 ARG GO_BASE_IMAGE
 ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
-FROM $GO_BASE_IMAGE as go_builder
+FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as go_builder
 
 WORKDIR /go/src/sigs.k8s.io/scheduler-plugins
 COPY . .
-RUN make build-controller
+ARG TARGETARCH
+RUN make build-controller GO_BUILD_ENV='CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH}'
 
-FROM $DISTROLESS_BASE_IMAGE
+FROM --platform=${BUILDPLATFORM} $DISTROLESS_BASE_IMAGE
 
 COPY --from=go_builder /go/src/sigs.k8s.io/scheduler-plugins/bin/controller /bin/controller
 

build/scheduler/Dockerfile

@@ -13,14 +13,14 @@
 # limitations under the License.
 ARG GO_BASE_IMAGE
 ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
-FROM $GO_BASE_IMAGE as go-builder
+FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as go-builder
 
 WORKDIR /go/src/sigs.k8s.io/scheduler-plugins
 COPY . .
-ARG RELEASE_VERSION
-RUN RELEASE_VERSION=${RELEASE_VERSION} make build-scheduler
+ARG TARGETARCH
+RUN make build-scheduler GO_BUILD_ENV='CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH}'
 
-FROM $DISTROLESS_BASE_IMAGE
+FROM --platform=${BUILDPLATFORM} $DISTROLESS_BASE_IMAGE
 
 COPY --from=go-builder /go/src/sigs.k8s.io/scheduler-plugins/bin/kube-scheduler /bin/kube-scheduler
 

hack/build-images.sh

@@ -38,10 +38,17 @@ if [[ "${BUILDER}" == "podman" ]]; then
 fi
 
 cd "${SCRIPT_ROOT}"
+IMAGE_BUILD_CMD=${DOCKER_BUILDX_CMD:-${BUILDER} buildx}
+
+# use RELEASE_VERSION==v0.0.0 to tell if it's a local image build.
+BLD_INSTANCE=""
+if [[ "${RELEASE_VERSION}" == "v0.0.0" ]]; then
+  BLD_INSTANCE=$($IMAGE_BUILD_CMD create --use)
+fi
 
 # DOCKER_BUILDX_CMD is an env variable set in CI (valued as "/buildx-entrypoint")
 # If it's set, use it; otherwise use "$BUILDER buildx"
-${DOCKER_BUILDX_CMD:-${BUILDER} buildx} build \
+${IMAGE_BUILD_CMD} build \
   --platform=${PLATFORMS} \
   -f ${SCHEDULER_DIR}/Dockerfile \
   --build-arg RELEASE_VERSION=${RELEASE_VERSION} \
@@ -50,11 +57,15 @@ ${DOCKER_BUILDX_CMD:-${BUILDER} buildx} build \
   --build-arg CGO_ENABLED=0 \
   ${EXTRA_ARGS:-}  ${TAG_FLAG:-} ${REGISTRY}/${IMAGE} .
 
-${DOCKER_BUILDX_CMD:-${BUILDER} buildx} build \
+${IMAGE_BUILD_CMD} build \
   --platform=${PLATFORMS} \
   -f ${CONTROLLER_DIR}/Dockerfile \
   --build-arg RELEASE_VERSION=${RELEASE_VERSION} \
   --build-arg GO_BASE_IMAGE=${GO_BASE_IMAGE} \
   --build-arg DISTROLESS_BASE_IMAGE=${DISTROLESS_BASE_IMAGE} \
   --build-arg CGO_ENABLED=0 \
   ${EXTRA_ARGS:-} ${TAG_FLAG:-} ${REGISTRY}/${CONTROLLER_IMAGE} .
+
+if [[ ! -z $BLD_INSTANCE ]]; then
+  ${DOCKER_BUILDX_CMD:-${BUILDER} buildx} rm $BLD_INSTANCE
+fi