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 <[email protected]>
kubernetes · May 12, 2020 · 4878b82 · 4878b82
1 parent a0751e9
commit 4878b82
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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} \