From 32b61ea28c2634984f38c6f94e8e69149d6d68dd Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Thu, 19 Mar 2020 20:06:15 -0400 Subject: [PATCH 1/3] build: Remove kube-cross image building kube-cross image building has moved to k/release/images/build/cross. Signed-off-by: Stephen Augustus --- build/build-image/cross/Dockerfile | 79 ------------------------- build/build-image/cross/Makefile | 35 ----------- build/build-image/cross/cloudbuild.yaml | 13 ---- build/dependencies.yaml | 2 - 4 files changed, 129 deletions(-) delete mode 100644 build/build-image/cross/Dockerfile delete mode 100644 build/build-image/cross/Makefile delete mode 100644 build/build-image/cross/cloudbuild.yaml diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile deleted file mode 100644 index eee787a14ff..00000000000 --- a/build/build-image/cross/Dockerfile +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2016 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. - -# This file creates a standard build environment for building cross -# platform go binary for the architecture kubernetes cares about. - -FROM golang:1.13.8 - -ENV GOARM 7 -ENV KUBE_DYNAMIC_CROSSPLATFORMS \ - armhf \ - arm64 \ - s390x \ - ppc64el - -ENV KUBE_CROSSPLATFORMS \ - linux/386 \ - linux/arm linux/arm64 \ - linux/ppc64le \ - linux/s390x \ - darwin/amd64 darwin/386 \ - windows/amd64 windows/386 - -# Pre-compile the standard go library when cross-compiling. This is much easier now when we have go1.5+ -RUN for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${platform##*/} go install std; done \ - && go clean -cache - -# Install g++, then download and install protoc for generating protobuf output -RUN apt-get update \ - && apt-get install -y rsync jq apt-utils file patch unzip \ - && apt-get clean && rm -rf /var/lib/apt/lists/* - -# Use dynamic cgo linking for architectures other than amd64 for the server platforms -# To install crossbuild essential for other architectures add the following repository. -RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" > /etc/apt/sources.list.d/cgocrosscompiling.list \ - && apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32 \ - && apt-get update \ - && apt-get install -y build-essential \ - && for platform in ${KUBE_DYNAMIC_CROSSPLATFORMS}; do apt-get install -y crossbuild-essential-${platform}; done \ - && apt-get clean && rm -rf /var/lib/apt/lists/* - -RUN PROTOBUF_VERSION=3.0.2; ZIPNAME="protoc-${PROTOBUF_VERSION}-linux-x86_64.zip"; \ - mkdir /tmp/protoc && cd /tmp/protoc \ - && wget "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/${ZIPNAME}" \ - && unzip "${ZIPNAME}" \ - && chmod -R +rX /tmp/protoc \ - && cp -pr bin /usr/local \ - && cp -pr include /usr/local \ - && rm -rf /tmp/protoc \ - && protoc --version - -# work around 64MB tmpfs size in Docker 1.6 -ENV TMPDIR /tmp.k8s -RUN mkdir $TMPDIR \ - && chmod a+rwx $TMPDIR \ - && chmod o+t $TMPDIR - -# Get the code coverage tool and goimports -RUN go get golang.org/x/tools/cmd/cover \ - golang.org/x/tools/cmd/goimports \ - && go clean -cache - -# Download and symlink etcd. We need this for our integration tests. -RUN export ETCD_VERSION=v3.2.24; \ - mkdir -p /usr/local/src/etcd \ - && cd /usr/local/src/etcd \ - && curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \ - && ln -s ../src/etcd/etcd-${ETCD_VERSION}-linux-amd64/etcd /usr/local/bin/ diff --git a/build/build-image/cross/Makefile b/build/build-image/cross/Makefile deleted file mode 100644 index defb0f5e671..00000000000 --- a/build/build-image/cross/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2016 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. - -.PHONY: build push - -STAGING_REGISTRY?=gcr.io/k8s-staging-build-image -PROD_REGISTRY?=us.gcr.io/k8s-artifacts-prod/build-image -IMAGE=kube-cross - -TAG?=kubernetes-$(shell git describe --tags --match='v*' --abbrev=14) -KUBE_CROSS_VERSION=$(shell cat VERSION) - -all: build push - -build: - docker build \ - -t $(STAGING_REGISTRY)/$(IMAGE):$(TAG) \ - -t $(STAGING_REGISTRY)/$(IMAGE):$(KUBE_CROSS_VERSION) \ - -t $(PROD_REGISTRY)/$(IMAGE):$(KUBE_CROSS_VERSION) \ - . - -push: - docker push $(STAGING_REGISTRY)/$(IMAGE):$(TAG) - docker push $(STAGING_REGISTRY)/$(IMAGE):$(KUBE_CROSS_VERSION) diff --git a/build/build-image/cross/cloudbuild.yaml b/build/build-image/cross/cloudbuild.yaml deleted file mode 100644 index 9b698c43349..00000000000 --- a/build/build-image/cross/cloudbuild.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# See https://cloud.google.com/cloud-build/docs/build-config -timeout: 1200s -options: - substitution_option: ALLOW_LOOSE -steps: - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20191019-6567e5c' - entrypoint: make - env: - - DOCKER_CLI_EXPERIMENTAL=enabled - args: - - all -images: - - 'gcr.io/$PROJECT_ID/kube-cross:kubernetes-${_GIT_TAG}' diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c2e61514f9c..00399bd43e8 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -34,8 +34,6 @@ dependencies: - name: "golang" version: 1.13.8 refPaths: - - path: build/build-image/cross/Dockerfile - match: "golang:" - path: build/build-image/cross/VERSION - path: build/root/WORKSPACE match: go_version From b6179ac7b9755e0c3ea31bf5148d7fa52bbdcd3b Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Thu, 19 Mar 2020 20:15:24 -0400 Subject: [PATCH 2/3] deps: Update to Golang 1.13.9 Signed-off-by: Stephen Augustus Co-authored-by: Jeff Grafton --- build/build-image/cross/VERSION | 2 +- build/dependencies.yaml | 2 +- build/root/WORKSPACE | 23 ++++++++++++++++++++--- test/images/Makefile | 2 +- test/images/sample-apiserver/Dockerfile | 2 +- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index d1d10070e0e..83b672bbe4d 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.13.8-1 +v1.13.9-2 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 00399bd43e8..ec46f6fbbf8 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -32,7 +32,7 @@ dependencies: - name: "golang" - version: 1.13.8 + version: 1.13.9 refPaths: - path: build/build-image/cross/VERSION - path: build/root/WORKSPACE diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index a4ba91ce427..9c45836d100 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -48,14 +48,31 @@ http_archive( urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.20.7/rules_go-v0.20.7.tar.gz"), ) -load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") +load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies") go_rules_dependencies() -go_register_toolchains( - go_version = "1.13.8", +# The version of rules_go we're using here is no longer supported, so +# we must manually download a newer version of the go sdk. +go_download_sdk( + name = "go_sdk", + sdks = { + "darwin_amd64": ("go1.13.9.darwin-amd64.tar.gz", "450e59538ed5d3f2b165ba5107530afce6e8e89c6cc5c90a0cbf0a58846ef3b1"), + "freebsd_386": ("go1.13.9.freebsd-386.tar.gz", "6b75a5a46ebbdf06aa5023f2bd0ad7e9e37389125468243368d5795e1c15c9cd"), + "freebsd_amd64": ("go1.13.9.freebsd-amd64.tar.gz", "87716246da52c193226df44031aaf45e45ebfc23e01bdc845311c1b560e76e2b"), + "linux_386": ("go1.13.9.linux-386.tar.gz", "a2744aa2ddc68d888e9f65c2cbe4c8b527b139688ce232ead90dc2961f8d51a8"), + "linux_amd64": ("go1.13.9.linux-amd64.tar.gz", "f4ad8180dd0aaf7d7cda7e2b0a2bf27e84131320896d376549a7d849ecf237d7"), + "linux_arm64": ("go1.13.9.linux-arm64.tar.gz", "b53cb466d7986e5e17a3d4c196bc95df08a35968eced5efd7e128387a246c46e"), + "linux_arm": ("go1.13.9.linux-armv6l.tar.gz", "a3c2941a1fde8692514ece7e2180a0e3ca70609f52756a66bc0ab68c63572361"), + "linux_ppc64le": ("go1.13.9.linux-ppc64le.tar.gz", "90beb01962202f332be0a7c8dad2db3d30242759ba863db3f36c45d241940efc"), + "linux_s390x": ("go1.13.9.linux-s390x.tar.gz", "a40949aaf55912b06df8fda511c33fde3e52d377706bdc095332652c1ad225e3"), + "windows_386": ("go1.13.9.windows-386.zip", "e22406377448f1aea2dd1517327e5ae452d826c0c7624b3511d5af510c57b69a"), + "windows_amd64": ("go1.13.9.windows-amd64.zip", "cf066aabdf4d83c251aaace14b57a35aafffd1fa67d54d907f27fb31e470a135"), + }, ) +go_register_toolchains() + http_archive( name = "io_bazel_rules_docker", sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d", diff --git a/test/images/Makefile b/test/images/Makefile index b588d739aca..deca1cd2b67 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -15,7 +15,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images GOARM ?= 7 QEMUVERSION=v2.9.1 -GOLANG_VERSION=1.13.8 +GOLANG_VERSION=1.13.9 export ifndef WHAT diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile index 1d8e8205ddc..7124d2a20b6 100644 --- a/test/images/sample-apiserver/Dockerfile +++ b/test/images/sample-apiserver/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG BASEIMAGE -FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.8-1 as build_k8s_1_17_sample_apiserver +FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.9-2 as build_k8s_1_17_sample_apiserver ENV GOPATH /go RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin From 979e3e0dd529bbcd0f0cdef22fc7f82f66ae48ce Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 23 Mar 2020 18:18:58 -0400 Subject: [PATCH 3/3] build/dependencies: Remove bazel WORKSPACE go_version check When supplying the go_download_sdk instead of updating rules_go, the go_version is removed, so we shouldn't check for it anymore in hack/verify-external-dependencies-version.sh. Without this, pull-kubernetes-verify jobs will fail. Signed-off-by: Stephen Augustus --- build/dependencies.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index ec46f6fbbf8..7efec51b8f0 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -35,8 +35,6 @@ dependencies: version: 1.13.9 refPaths: - path: build/build-image/cross/VERSION - - path: build/root/WORKSPACE - match: go_version - path: test/images/Makefile match: GOLANG_VERSION