Merge pull request #771 from Huang-Wei/reduce-build-time

Author: Huang-Wei

Makefile

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # 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
@@ -32,8 +33,9 @@ RELEASE_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)
-GO_BASE_IMAGE?=golang
+GO_BASE_IMAGE?=golang:$(GO_VERSION)
 DISTROLESS_BASE_IMAGE?=gcr.io/distroless/static:nonroot
+EXTRA_ARGS=""
 
 # VERSION is the scheduler's version
 #
@@ -57,12 +59,8 @@ build-controller:
 build-scheduler:
 	$(COMMONENVVAR) $(BUILDENVVAR) go build -ldflags '-X k8s.io/component-base/version.gitVersion=$(VERSION) -w' -o bin/kube-scheduler cmd/scheduler/main.go
 
-.PHONY: local-image
-local-image: clean
-	RELEASE_VERSION=$(RELEASE_VERSION) hack/build-images.sh
-
-.PHONY: release-image
-release-image:
+.PHONY: build-images
+build-images:
 	BUILDER=$(BUILDER) \
 	PLATFORMS=$(PLATFORMS) \
 	RELEASE_VERSION=$(RELEASE_VERSION) \
@@ -71,13 +69,20 @@ release-image:
 	CONTROLLER_IMAGE=$(RELEASE_CONTROLLER_IMAGE) \
 	GO_BASE_IMAGE=$(GO_BASE_IMAGE) \
 	DISTROLESS_BASE_IMAGE=$(DISTROLESS_BASE_IMAGE) \
-	hack/build-images.sh
+	DOCKER_BUILDX_CMD=$(DOCKER_BUILDX_CMD) \
+	EXTRA_ARGS=$(EXTRA_ARGS) hack/build-images.sh
 
-.PHONY: push-release-images
-push-release-images: release-image
-	gcloud auth configure-docker
-	DOCKER_CLI_EXPERIMENTAL=enabled $(BUILDER) manifest push $(ALL_FLAG) $(RELEASE_REGISTRY)/$(RELEASE_IMAGE) ;\
-	DOCKER_CLI_EXPERIMENTAL=enabled $(BUILDER) manifest push $(ALL_FLAG) $(RELEASE_REGISTRY)/$(RELEASE_CONTROLLER_IMAGE) ;\
+.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: clean build-images
+
+.PHONY: release-images
+push-images: EXTRA_ARGS="--push"
+push-images: build-images
 
 .PHONY: update-vendor
 update-vendor:

build/controller/Dockerfile

@@ -11,17 +11,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-ARG GO_BASE_IMAGE=golang
+ARG GO_BASE_IMAGE
 ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
-FROM $GO_BASE_IMAGE:1.21
+FROM $GO_BASE_IMAGE as go_builder
 
 WORKDIR /go/src/sigs.k8s.io/scheduler-plugins
 COPY . .
 RUN make build-controller
 
 FROM $DISTROLESS_BASE_IMAGE
 
-COPY --from=0 /go/src/sigs.k8s.io/scheduler-plugins/bin/controller /bin/controller
+COPY --from=go_builder /go/src/sigs.k8s.io/scheduler-plugins/bin/controller /bin/controller
 
 WORKDIR /bin
 CMD ["controller"]

build/scheduler/Dockerfile

@@ -11,9 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-ARG GO_BASE_IMAGE=golang
+ARG GO_BASE_IMAGE
 ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
-FROM $GO_BASE_IMAGE:1.21
+FROM $GO_BASE_IMAGE as go-builder
 
 WORKDIR /go/src/sigs.k8s.io/scheduler-plugins
 COPY . .
@@ -22,7 +22,7 @@ RUN RELEASE_VERSION=${RELEASE_VERSION} make build-scheduler
 
 FROM $DISTROLESS_BASE_IMAGE
 
-COPY --from=0 /go/src/sigs.k8s.io/scheduler-plugins/bin/kube-scheduler /bin/kube-scheduler
+COPY --from=go-builder /go/src/sigs.k8s.io/scheduler-plugins/bin/kube-scheduler /bin/kube-scheduler
 
 WORKDIR /bin
 CMD ["kube-scheduler"]

cloudbuild.yaml

@@ -12,12 +12,11 @@ steps:
   - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240718-5ef92b5c36'
     entrypoint: make
     env:
-    - DOCKER_CLI_EXPERIMENTAL=enabled
     - RELEASE_VERSION=$_GIT_TAG
     - BASE_REF=$_PULL_BASE_REF
     - DOCKER_BUILDX_CMD=/buildx-entrypoint
     args:
-    - push-release-images
+    - push-images
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
   # can be used as a substitution

hack/build-images.sh

@@ -23,17 +23,6 @@ SCRIPT_ROOT=$(realpath $(dirname "${BASH_SOURCE[@]}")/..)
 SCHEDULER_DIR="${SCRIPT_ROOT}"/build/scheduler
 CONTROLLER_DIR="${SCRIPT_ROOT}"/build/controller
 
-REGISTRY=${REGISTRY:-"localhost:5000/scheduler-plugins"}
-IMAGE=${IMAGE:-"kube-scheduler:latest"}
-CONTROLLER_IMAGE=${CONTROLLER_IMAGE:-"controller:latest"}
-
-RELEASE_VERSION=${RELEASE_VERSION:-"v0.0.0"}
-
-BUILDER=${BUILDER:-"docker"}
-
-GO_BASE_IMAGE=${GO_BASE_IMAGE:-"golang"}
-DISTROLESS_BASE_IMAGE=${DISTROLESS_BASE_IMAGE:-"gcr.io/distroless/static:nonroot"}
-
 # -t is the Docker engine default
 TAG_FLAG="-t"
 
@@ -58,12 +47,14 @@ ${DOCKER_BUILDX_CMD:-${BUILDER} buildx} build \
   --build-arg RELEASE_VERSION=${RELEASE_VERSION} \
   --build-arg GO_BASE_IMAGE=${GO_BASE_IMAGE} \
   --build-arg DISTROLESS_BASE_IMAGE=${DISTROLESS_BASE_IMAGE} \
-  ${TAG_FLAG} ${REGISTRY}/${IMAGE} .
+  --build-arg CGO_ENABLED=0 \
+  ${EXTRA_ARGS:-}  ${TAG_FLAG:-} ${REGISTRY}/${IMAGE} .
 
 ${DOCKER_BUILDX_CMD:-${BUILDER} buildx} 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} \
-  {TAG_FLAG} ${REGISTRY}/${CONTROLLER_IMAGE} .
+  --build-arg CGO_ENABLED=0 \
+  ${EXTRA_ARGS:-} ${TAG_FLAG:-} ${REGISTRY}/${CONTROLLER_IMAGE} .