-
Notifications
You must be signed in to change notification settings - Fork 506
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1710 from justaugustus/krel-ci-build
k8s-ci-builder: Clean up image building configs
- Loading branch information
Showing
15 changed files
with
552 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| # Copyright 2020 The Kubernetes Authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # 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. | ||
|
|
||
| # set default shell | ||
| SHELL=/bin/bash -o pipefail | ||
|
|
||
| REGISTRY ?= gcr.io/k8s-staging-releng | ||
| IMGNAME = k8s-ci-builder | ||
| CONFIG ?= default | ||
|
|
||
| IMAGE = $(REGISTRY)/$(IMGNAME) | ||
|
|
||
| TAG ?= $(shell git describe --tags --always --dirty) | ||
|
|
||
| # Build args | ||
| GO_VERSION ?= 1.15.3 | ||
| BAZEL_VERSION ?= 3.4.1 | ||
| OLD_BAZEL_VERSION ?= 2.2.0 | ||
|
|
||
| BUILD_ARGS = --build-arg=GO_VERSION=$(GO_VERSION) \ | ||
| --build-arg=BAZEL_VERSION=$(BAZEL_VERSION) \ | ||
| --build-arg=OLD_BAZEL_VERSION=$(OLD_BAZEL_VERSION) | ||
|
|
||
| # Ensure support for 'docker buildx' and 'docker manifest' commands | ||
| export DOCKER_CLI_EXPERIMENTAL=enabled | ||
|
|
||
| # build with buildx | ||
| # https://github.com/docker/buildx/issues/59 | ||
| .PHONY: build | ||
| build: init-docker-buildx | ||
| echo "Building $(IMGNAME)..." | ||
| docker buildx build \ | ||
| --load \ | ||
| --progress plain \ | ||
| --platform linux/amd64 \ | ||
| --tag $(IMAGE):$(CONFIG) \ | ||
| --tag $(IMAGE):$(TAG)-$(CONFIG) \ | ||
| --tag $(IMAGE):latest-$(CONFIG) \ | ||
| $(BUILD_ARGS) \ | ||
| -f $(CURDIR)/Dockerfile \ | ||
| ../../../. | ||
|
|
||
| .PHONY: push | ||
| push: build | ||
| echo "Pushing $(IMGNAME) tags" | ||
| docker push $(IMAGE):$(CONFIG) | ||
| docker push $(IMAGE):$(TAG)-$(CONFIG) | ||
| docker push $(IMAGE):latest-$(CONFIG) | ||
|
|
||
| # enable buildx | ||
| .PHONY: init-docker-buildx | ||
| init-docker-buildx: | ||
| ./../../../hack/init-buildx.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,53 @@ | ||
| # See https://cloud.google.com/cloud-build/docs/build-config | ||
| # See https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/README.md for more details on image pushing process | ||
|
|
||
| # this must be specified in seconds. If omitted, defaults to 600s (10 mins) | ||
| timeout: 1200s | ||
|
|
||
| # this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF, | ||
| # or any new substitutions added in the future. | ||
| options: | ||
| substitution_option: ALLOW_LOOSE | ||
| machineType: 'N1_HIGHCPU_8' | ||
|
|
||
| steps: | ||
| - name: gcr.io/cloud-builders/docker | ||
| id: build | ||
| dir: images/releng/k8s-ci-builder | ||
| # TODO: Update image version | ||
| - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200824-5d057db' | ||
| entrypoint: 'bash' | ||
| dir: ./images/releng/k8s-ci-builder | ||
| env: | ||
| - DOCKER_CLI_EXPERIMENTAL=enabled | ||
| - REGISTRY=gcr.io/$PROJECT_ID | ||
| - HOME=/root | ||
| - TAG=${_GIT_TAG} | ||
| - PULL_BASE_REF=${_PULL_BASE_REF} | ||
| - CONFIG=${_CONFIG} | ||
| - GO_VERSION=${_GO_VERSION} | ||
| - BAZEL_VERSION=${_BAZEL_VERSION} | ||
| - OLD_BAZEL_VERSION=${_OLD_BAZEL_VERSION} | ||
| args: | ||
| - build | ||
| - --tag=gcr.io/$PROJECT_ID/k8s-ci-builder:${_GIT_TAG}-${_CONFIG} | ||
| - --tag=gcr.io/$PROJECT_ID/k8s-ci-builder:latest-${_CONFIG} | ||
| - --tag=gcr.io/$PROJECT_ID/k8s-ci-builder:${_KUBE_CROSS_VERSION} | ||
| - --build-arg=GO_VERSION=${_GO_VERSION} | ||
| - --build-arg=KUBE_CROSS_VERSION=${_KUBE_CROSS_VERSION} | ||
| - -f ./Dockerfile | ||
| - ../../../. | ||
| - '-c' | ||
| - | | ||
| gcloud auth configure-docker \ | ||
| && make push | ||
| 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 | ||
| _GIT_TAG: '12345' | ||
| _PULL_BASE_REF: 'dev' | ||
| _CONFIG: 'cross0.0' | ||
| _CONFIG: 'config' | ||
| _GO_VERSION: '0.0.0' | ||
| _KUBE_CROSS_VERSION: 'v0.0.0-0' | ||
|
|
||
| images: | ||
| - 'gcr.io/$PROJECT_ID/k8s-ci-builder:${_GIT_TAG}-${_CONFIG}' | ||
| - 'gcr.io/$PROJECT_ID/k8s-ci-builder:latest-${_CONFIG}' | ||
| - 'gcr.io/$PROJECT_ID/k8s-ci-builder:${_KUBE_CROSS_VERSION}' | ||
| _BAZEL_VERSION: '0.0.0' | ||
| _OLD_BAZEL_VERSION: '0.0.0' | ||
|
|
||
| tags: | ||
| - 'k8s-ci-builder' | ||
| - ${_GIT_TAG} | ||
| - ${_PULL_BASE_REF} | ||
| - ${_CONFIG} | ||
| - ${_GO_VERSION} | ||
| - ${_KUBE_CROSS_VERSION} | ||
|
|
||
| images: | ||
| - 'gcr.io/$PROJECT_ID/k8s-ci-builder:${_CONFIG}' | ||
| - 'gcr.io/$PROJECT_ID/k8s-ci-builder:${_GIT_TAG}-${_CONFIG}' | ||
| - 'gcr.io/$PROJECT_ID/k8s-ci-builder:latest-${_CONFIG}' |
Oops, something went wrong.