From 8cd823bb2f0f7a557d69a7788e90e77a8164c89d Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 11 May 2020 23:03:39 -0400 Subject: [PATCH 1/7] images: Revert k8s-cloud-builder changes in kube-cross Signed-off-by: Stephen Augustus --- images/build/cross/Dockerfile | 72 +---------------------------- images/build/cross/variants.yaml | 4 +- images/k8s-cloud-builder/Dockerfile | 59 +++++++++++------------ 3 files changed, 29 insertions(+), 106 deletions(-) diff --git a/images/build/cross/Dockerfile b/images/build/cross/Dockerfile index 2ed71364393..2b1d1f66bbd 100644 --- a/images/build/cross/Dockerfile +++ b/images/build/cross/Dockerfile @@ -48,28 +48,10 @@ RUN for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${plat RUN apt-get -q update \ && apt-get install -qqy \ apt-utils \ - apt-transport-https \ - bsdmainutils \ - ca-certificates \ - curl \ file \ - gettext-base \ - git \ - gnupg2 \ - grep \ jq \ - libassuan-dev \ - libbtrfs-dev \ - libdevmapper-dev \ - libgpgme-dev \ - lsb-release \ - make \ - net-tools \ - pandoc \ patch \ rsync \ - software-properties-common \ - tzdata \ unzip # Use dynamic cgo linking for architectures other than amd64 for the server platforms @@ -109,63 +91,11 @@ RUN mkdir -p /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/ -# We want to get rid of python2, we want only python3 -# -# Right now, the image chain looks like this: -# k8s-cloud-builder <- k8s.gcr.io/kube-cross:v1.13.4-1 <- golang:1.13.4 <- buildpack-deps:buster-scm <- debian:buster -# python2 comes in with buildpack-deps:buster-scm, because that image installs -# mercurial which in turn has a hard dependency on python2 -RUN apt-get -qqy purge ".*python2.*" \ - && apt-get -qqy install \ - python3-minimal \ - python3-pip \ - && update-alternatives --install /usr/bin/python python /usr/bin/python3 90 \ - && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 90 - -# Install Pip packages -RUN pip3 install --no-cache-dir \ - # for gcloud https://cloud.google.com/storage/docs/gsutil/addlhelp/CRC32CandInstallingcrcmod - crcmod \ - yq - -# common::set_cloud_binaries() looks for it in this path -ARG GOOGLE_DIR='/opt/google' - -# Install gcloud -RUN bash -c \ - 'bash <(curl -sSL https://sdk.cloud.google.com) \ - --install-dir="${GOOGLE_DIR}" \ - --disable-prompts \ - >/dev/null' - -ENV PATH="${GOOGLE_DIR}/google-cloud-sdk/bin:${PATH}" - -# Install docker cli -# https://docs.docker.com/install/linux/docker-ce/debian/ -RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \ - && apt-key fingerprint 0EBFCD88 \ - && add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/debian \ - $(lsb_release -cs) \ - stable" \ - && apt-get -y update \ - && apt-get -qqy install \ - docker-ce-cli - -ARG SKOPEO_VERSION=v0.1.41 -RUN git clone https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo -RUN cd $GOPATH/src/github.com/containers/skopeo \ - && git checkout ${SKOPEO_VERSION} \ - && make binary-local \ - && cp skopeo /usr/local/bin \ - && rm -rf $GOPATH/src/github.com/containers/skopeo - # Cleanup a bit RUN apt-get -qqy remove \ wget \ && apt-get clean \ && rm -rf -- \ - /var/lib/apt/lists/* \ - ~/.config/gcloud + /var/lib/apt/lists/* ENTRYPOINT [] diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index fbcfbba5eed..281662cd1b3 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -2,14 +2,14 @@ variants: go1.14: CONFIG: 'go1.14' GO_VERSION: '1.14.2' - KUBE_CROSS_VERSION: 'v1.14.2-3' + KUBE_CROSS_VERSION: 'v1.14.2-4' PROTOBUF_VERSION: '3.11.4' ETCD_VERSION: 'v3.4.7' SKOPEO_VERSION: 'v0.2.0' go1.13: CONFIG: 'go1.13' GO_VERSION: '1.13.9' - KUBE_CROSS_VERSION: 'v1.13.9-4' + KUBE_CROSS_VERSION: 'v1.13.9-5' PROTOBUF_VERSION: '3.11.4' ETCD_VERSION: 'v3.4.7' SKOPEO_VERSION: 'v0.2.0' diff --git a/images/k8s-cloud-builder/Dockerfile b/images/k8s-cloud-builder/Dockerfile index 4ac1179f9da..f76c7c15d2e 100644 --- a/images/k8s-cloud-builder/Dockerfile +++ b/images/k8s-cloud-builder/Dockerfile @@ -12,31 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. +FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.12.17-1 ##------------------------------------------------------------ # global ARGs & ENVs + ARG DEBIAN_FRONTEND=noninteractive ##------------------------------------------------------------ -FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.12.17-1 - -RUN apt-get -q update - -# We want to get rid of python2, we want only python3 -# -# Right now, the image chain looks like this: -# k8s-cloud-builder <- k8s.gcr.io/kube-cross:v1.13.4-1 <- golang:1.13.4 <- buildpack-deps:buster-scm <- debian:buster -# python2 comes in with buildpack-deps:buster-scm, because that image installs -# mercurial which in turn has a hard dependency on python2 -RUN apt-get -qqy purge ".*python2.*" \ - && apt-get -qqy install \ - python3-minimal \ - python3-pip \ - && update-alternatives --install /usr/bin/python python /usr/bin/python3 90 \ - && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 90 # Install packages -RUN apt-get install -qqy \ +RUN apt-get -q update \ + && apt-get install -qqy \ apt-transport-https \ bsdmainutils \ ca-certificates \ @@ -59,29 +46,34 @@ RUN apt-get install -qqy \ tzdata \ unzip +# We want to get rid of python2, we want only python3 +# +# Right now, the image chain looks like this: +# k8s-cloud-builder <- k8s.gcr.io/kube-cross:v1.13.4-1 <- golang:1.13.4 <- buildpack-deps:buster-scm <- debian:buster +# python2 comes in with buildpack-deps:buster-scm, because that image installs +# mercurial which in turn has a hard dependency on python2 +RUN apt-get -qqy purge ".*python2.*" \ + && apt-get -qqy install \ + python3-minimal \ + python3-pip \ + && update-alternatives --install /usr/bin/python python /usr/bin/python3 90 \ + && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 90 + # Install Pip packages RUN pip3 install --no-cache-dir \ - # for gcloud https://cloud.google.com/storage/docs/gsutil/addlhelp/CRC32CandInstallingcrcmod - crcmod \ - # For now we do not re-install mercurial, we think we might not need it after all. - # - # # We for now need to install mercurial via pip as opposed to via - # # apt/dpkg to not pull in python2. As soon as debian has a mercurial package - # # that has no hard dependency on python2, we can switch back to using the - # # distributor's package again. - # mercurial \ - yq + # for gcloud https://cloud.google.com/storage/docs/gsutil/addlhelp/CRC32CandInstallingcrcmod + crcmod \ + yq # common::set_cloud_binaries() looks for it in this path ARG GOOGLE_DIR='/opt/google' # Install gcloud -RUN bash -c ' \ - bash <(curl -sSL https://sdk.cloud.google.com) \ - --install-dir="${GOOGLE_DIR}" \ - --disable-prompts \ - >/dev/null \ - ' +RUN bash -c \ + 'bash <(curl -sSL https://sdk.cloud.google.com) \ + --install-dir="${GOOGLE_DIR}" \ + --disable-prompts \ + >/dev/null' ENV PATH="${GOOGLE_DIR}/google-cloud-sdk/bin:${PATH}" @@ -108,6 +100,7 @@ RUN cd $GOPATH/src/github.com/containers/skopeo \ # Cleanup a bit RUN apt-get -qqy remove \ wget \ + && apt-get clean \ && rm -rf -- \ /var/lib/apt/lists/* \ ~/.config/gcloud From 3c680e815526195ef5cb1f4f2fd694a9389552a7 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 11 May 2020 23:09:42 -0400 Subject: [PATCH 2/7] images/k8s-cloud-builder: Fix indentation Signed-off-by: Stephen Augustus --- images/k8s-cloud-builder/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/k8s-cloud-builder/Dockerfile b/images/k8s-cloud-builder/Dockerfile index f76c7c15d2e..2d3a13b5217 100644 --- a/images/k8s-cloud-builder/Dockerfile +++ b/images/k8s-cloud-builder/Dockerfile @@ -82,9 +82,9 @@ ENV PATH="${GOOGLE_DIR}/google-cloud-sdk/bin:${PATH}" RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \ && apt-key fingerprint 0EBFCD88 \ && add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/debian \ - $(lsb_release -cs) \ - stable" \ + "deb [arch=amd64] https://download.docker.com/linux/debian \ + $(lsb_release -cs) \ + stable" \ && apt-get -y update \ && apt-get -qqy install \ docker-ce-cli @@ -99,7 +99,7 @@ RUN cd $GOPATH/src/github.com/containers/skopeo \ # Cleanup a bit RUN apt-get -qqy remove \ - wget \ + wget \ && apt-get clean \ && rm -rf -- \ /var/lib/apt/lists/* \ From d08cd9dae6e244124ed197e829222bc27ea0c5a0 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 11 May 2020 23:13:49 -0400 Subject: [PATCH 3/7] kube-cross: Fixup version arguments Signed-off-by: Stephen Augustus --- images/build/cross/Dockerfile | 2 +- images/build/cross/Makefile | 4 ++-- images/build/cross/variants.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/build/cross/Dockerfile b/images/build/cross/Dockerfile index 2b1d1f66bbd..c535f693591 100644 --- a/images/build/cross/Dockerfile +++ b/images/build/cross/Dockerfile @@ -85,7 +85,7 @@ RUN go get golang.org/x/tools/cmd/cover \ && go clean -cache # Download and symlink etcd. We need this for our integration tests. -ARG ETCD_VERSION=v3.2.24 +ARG ETCD_VERSION=v3.4.7 RUN 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 \ diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index a02ea319c5b..52f502d530b 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -20,11 +20,11 @@ IMAGE=kube-cross TAG?=$(shell git describe --tags --always --dirty) CONFIG?=go1.14 -KUBE_CROSS_VERSION?=v1.14.2-3 +KUBE_CROSS_VERSION?=v1.14.2-4 # Build args GO_VERSION?=1.14.2 -PROTOBUF_VERSION?=3.11.4 +PROTOBUF_VERSION?=3.0.2 ETCD_VERSION?=v3.4.7 SKOPEO_VERSION?=v0.2.0 diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 281662cd1b3..ccc537a9646 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -3,14 +3,14 @@ variants: CONFIG: 'go1.14' GO_VERSION: '1.14.2' KUBE_CROSS_VERSION: 'v1.14.2-4' - PROTOBUF_VERSION: '3.11.4' + PROTOBUF_VERSION: '3.0.2' ETCD_VERSION: 'v3.4.7' SKOPEO_VERSION: 'v0.2.0' go1.13: CONFIG: 'go1.13' GO_VERSION: '1.13.9' KUBE_CROSS_VERSION: 'v1.13.9-5' - PROTOBUF_VERSION: '3.11.4' + PROTOBUF_VERSION: '3.0.2' ETCD_VERSION: 'v3.4.7' SKOPEO_VERSION: 'v0.2.0' # DO NOT UPDATE CONFIGS BELOW THIS COMMENT From 565ea2db68143c31098512176d94aee7873c6e78 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 11 May 2020 23:36:23 -0400 Subject: [PATCH 4/7] kube-cross: Drop SKOPEO_VERSION from image config Signed-off-by: Stephen Augustus --- images/build/cross/Makefile | 2 -- images/build/cross/cloudbuild.yaml | 2 -- images/build/cross/variants.yaml | 3 --- 3 files changed, 7 deletions(-) diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index 52f502d530b..e8e282e5efc 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -26,7 +26,6 @@ KUBE_CROSS_VERSION?=v1.14.2-4 GO_VERSION?=1.14.2 PROTOBUF_VERSION?=3.0.2 ETCD_VERSION?=v3.4.7 -SKOPEO_VERSION?=v0.2.0 # TODO: Support multi-arch kube-cross images # ref: @@ -45,7 +44,6 @@ build: --build-arg=GO_VERSION=$(GO_VERSION) \ --build-arg=PROTOBUF_VERSION=$(PROTOBUF_VERSION) \ --build-arg=ETCD_VERSION=$(ETCD_VERSION) \ - --build-arg=SKOPEO_VERSION=$(SKOPEO_VERSION) \ . push: diff --git a/images/build/cross/cloudbuild.yaml b/images/build/cross/cloudbuild.yaml index 957ce7f66c4..2132f2f54ef 100644 --- a/images/build/cross/cloudbuild.yaml +++ b/images/build/cross/cloudbuild.yaml @@ -14,7 +14,6 @@ steps: - KUBE_CROSS_VERSION=$_KUBE_CROSS_VERSION - PROTOBUF_VERSION=$_PROTOBUF_VERSION - ETCD_VERSION=$_ETCD_VERSION - - SKOPEO_VERSION=$_SKOPEO_VERSION args: - all substitutions: @@ -27,7 +26,6 @@ substitutions: _KUBE_CROSS_VERSION: 'v0.0.0-0' _PROTOBUF_VERSION: '0.0.0' _ETCD_VERSION: 'v0.0.0' - _SKOPEO_VERSION: 'v0.0.0' images: - 'gcr.io/$PROJECT_ID/kube-cross-amd64:$_KUBE_CROSS_VERSION' - 'gcr.io/$PROJECT_ID/kube-cross-amd64:$_GIT_TAG-$_CONFIG' diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index ccc537a9646..8f15b240a61 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -5,14 +5,12 @@ variants: KUBE_CROSS_VERSION: 'v1.14.2-4' PROTOBUF_VERSION: '3.0.2' ETCD_VERSION: 'v3.4.7' - SKOPEO_VERSION: 'v0.2.0' go1.13: CONFIG: 'go1.13' GO_VERSION: '1.13.9' KUBE_CROSS_VERSION: 'v1.13.9-5' PROTOBUF_VERSION: '3.0.2' ETCD_VERSION: 'v3.4.7' - SKOPEO_VERSION: 'v0.2.0' # DO NOT UPDATE CONFIGS BELOW THIS COMMENT # The following Go versions are out of support go1.12: @@ -21,4 +19,3 @@ variants: KUBE_CROSS_VERSION: 'v1.12.17-2' PROTOBUF_VERSION: '3.0.2' ETCD_VERSION: 'v3.2.24' - SKOPEO_VERSION: 'v0.1.41' From 64454388a5819f8e93cc7ccac2c6f3af54781ab1 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 11 May 2020 23:53:55 -0400 Subject: [PATCH 5/7] k8s-cloud-builder: Enable variant building Signed-off-by: Stephen Augustus --- images/k8s-cloud-builder/Dockerfile | 5 +++-- images/k8s-cloud-builder/cloudbuild.yaml | 17 ++++++++++++----- images/k8s-cloud-builder/variants.yaml | 9 +++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 images/k8s-cloud-builder/variants.yaml diff --git a/images/k8s-cloud-builder/Dockerfile b/images/k8s-cloud-builder/Dockerfile index 2d3a13b5217..03cbe09c62c 100644 --- a/images/k8s-cloud-builder/Dockerfile +++ b/images/k8s-cloud-builder/Dockerfile @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.12.17-1 +ARG KUBE_CROSS_VERSION +FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:${KUBE_CROSS_VERSION} ##------------------------------------------------------------ # global ARGs & ENVs @@ -89,7 +90,7 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \ && apt-get -qqy install \ docker-ce-cli -ARG SKOPEO_VERSION=v0.1.41 +ARG SKOPEO_VERSION=v0.2.0 RUN git clone https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo RUN cd $GOPATH/src/github.com/containers/skopeo \ && git checkout ${SKOPEO_VERSION} \ diff --git a/images/k8s-cloud-builder/cloudbuild.yaml b/images/k8s-cloud-builder/cloudbuild.yaml index 42a324e6590..b8629e9c331 100644 --- a/images/k8s-cloud-builder/cloudbuild.yaml +++ b/images/k8s-cloud-builder/cloudbuild.yaml @@ -7,20 +7,27 @@ steps: id: build args: - build - - --tag=gcr.io/$PROJECT_ID/k8s-cloud-builder:${_GIT_TAG} - - --tag=gcr.io/$PROJECT_ID/k8s-cloud-builder:latest + - --tag=gcr.io/$PROJECT_ID/k8s-cloud-builder:${_GIT_TAG}-${_CONFIG} + - --tag=gcr.io/$PROJECT_ID/k8s-cloud-builder:latest-${_CONFIG} + - --tag=gcr.io/$PROJECT_ID/k8s-cloud-builder:${_KUBE_CROSS_VERSION} + - --build-arg=KUBE_CROSS_VERSION=${_KUBE_CROSS_VERSION} + - --build-arg=SKOPEO_VERSION=${_SKOPEO_VERSION} - . - name: gcr.io/gcp-runtimes/container-structure-test id: test args: - test - - --image=gcr.io/$PROJECT_ID/k8s-cloud-builder:latest + - --image=gcr.io/$PROJECT_ID/k8s-cloud-builder:${_GIT_TAG}-${_CONFIG} - --config=test.yaml 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' + _KUBE_CROSS_VERSION: 'v0.0.0-0' + _SKOPEO_VERSION: 'v0.0.0' images: - - 'gcr.io/$PROJECT_ID/k8s-cloud-builder:${_GIT_TAG}' - - 'gcr.io/$PROJECT_ID/k8s-cloud-builder:latest' + - 'gcr.io/$PROJECT_ID/k8s-cloud-builder:${_GIT_TAG}-${_CONFIG}' + - 'gcr.io/$PROJECT_ID/k8s-cloud-builder:latest-${_CONFIG}' + - 'gcr.io/$PROJECT_ID/k8s-cloud-builder:${_KUBE_CROSS_VERSION}' diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml new file mode 100644 index 00000000000..33bca97b31e --- /dev/null +++ b/images/k8s-cloud-builder/variants.yaml @@ -0,0 +1,9 @@ +variants: + cross1.14: + CONFIG: 'cross1.14' + KUBE_CROSS_VERSION: 'v1.14.2-1' + SKOPEO_VERSION: 'v0.2.0' + cross1.13: + CONFIG: 'cross1.13' + KUBE_CROSS_VERSION: 'v1.13.9-2' + SKOPEO_VERSION: 'v0.2.0' From a0751e9011e1099a564b2fd44d3e5ccb8c7d1a5b Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 12 May 2020 00:02:50 -0400 Subject: [PATCH 6/7] gcb: Use k8s-cloud-builder image for stage/release artifact phases Signed-off-by: Stephen Augustus --- gcb/release/cloudbuild.yaml | 2 +- gcb/stage/cloudbuild.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcb/release/cloudbuild.yaml b/gcb/release/cloudbuild.yaml index 10e0f3a0e84..67b4ce1c381 100644 --- a/gcb/release/cloudbuild.yaml +++ b/gcb/release/cloudbuild.yaml @@ -35,7 +35,7 @@ steps: args: - "./compile-release-tools" -- name: us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:${_KUBE_CROSS_VERSION} +- name: gcr.io/k8s-staging-releng/k8s-cloud-builder:${_KUBE_CROSS_VERSION} dir: "go/src/k8s.io/release" env: - "TOOL_ORG=${_TOOL_ORG}" diff --git a/gcb/stage/cloudbuild.yaml b/gcb/stage/cloudbuild.yaml index 97bcdaa955c..2f06a25a3d5 100644 --- a/gcb/stage/cloudbuild.yaml +++ b/gcb/stage/cloudbuild.yaml @@ -35,7 +35,7 @@ steps: args: - "./compile-release-tools" -- name: us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:${_KUBE_CROSS_VERSION} +- name: gcr.io/k8s-staging-releng/k8s-cloud-builder:${_KUBE_CROSS_VERSION} dir: "go/src/k8s.io/release" env: - "TOOL_ORG=${_TOOL_ORG}" @@ -79,7 +79,7 @@ steps: - "--basedir=/workspace" - "--tmpdir=/workspace/tmp" -- name: us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:${_KUBE_CROSS_VERSION} +- name: gcr.io/k8s-staging-releng/k8s-cloud-builder:${_KUBE_CROSS_VERSION} dir: "go/src/k8s.io/release" env: - "TOOL_ORG=${_TOOL_ORG}" From 4878b82a5e002be87b983f64e6bc5c8e97e0b9ba Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 12 May 2020 01:41:02 -0400 Subject: [PATCH 7/7] images: Remove extraneous config values - kube-cross: Drop go1.12 variant - images: Don't use default ARG values in Dockerfiles Signed-off-by: Stephen Augustus --- images/build/cross/Dockerfile | 4 ++-- images/build/cross/variants.yaml | 8 -------- images/k8s-cloud-builder/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/images/build/cross/Dockerfile b/images/build/cross/Dockerfile index c535f693591..5f0c8565270 100644 --- a/images/build/cross/Dockerfile +++ b/images/build/cross/Dockerfile @@ -62,7 +62,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" > /etc/apt/ && apt-get install -y build-essential \ && for platform in ${KUBE_DYNAMIC_CROSSPLATFORMS}; do apt-get install -y crossbuild-essential-${platform}; done -ARG PROTOBUF_VERSION=3.0.2 +ARG PROTOBUF_VERSION ENV ZIPNAME="protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" RUN mkdir /tmp/protoc && cd /tmp/protoc \ && wget "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/${ZIPNAME}" \ @@ -85,7 +85,7 @@ RUN go get golang.org/x/tools/cmd/cover \ && go clean -cache # Download and symlink etcd. We need this for our integration tests. -ARG ETCD_VERSION=v3.4.7 +ARG ETCD_VERSION RUN 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 \ diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 8f15b240a61..25c0afcf40b 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -11,11 +11,3 @@ variants: KUBE_CROSS_VERSION: 'v1.13.9-5' PROTOBUF_VERSION: '3.0.2' ETCD_VERSION: 'v3.4.7' - # DO NOT UPDATE CONFIGS BELOW THIS COMMENT - # The following Go versions are out of support - go1.12: - CONFIG: 'go1.12' - GO_VERSION: '1.12.17' - KUBE_CROSS_VERSION: 'v1.12.17-2' - PROTOBUF_VERSION: '3.0.2' - ETCD_VERSION: 'v3.2.24' diff --git a/images/k8s-cloud-builder/Dockerfile b/images/k8s-cloud-builder/Dockerfile index 03cbe09c62c..fa435d2d5dc 100644 --- a/images/k8s-cloud-builder/Dockerfile +++ b/images/k8s-cloud-builder/Dockerfile @@ -90,7 +90,7 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \ && apt-get -qqy install \ docker-ce-cli -ARG SKOPEO_VERSION=v0.2.0 +ARG SKOPEO_VERSION RUN git clone https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo RUN cd $GOPATH/src/github.com/containers/skopeo \ && git checkout ${SKOPEO_VERSION} \