kube-cross: Remove etcd from non-legacy builds

Signed-off-by: Stephen Augustus <foo@auggie.dev>

dependencies.yaml

@@ -55,8 +55,6 @@ dependencies:
   - name: "etcd"
     version: 3.4.13
     refPaths:
-    - path: images/build/cross/Makefile
-      match: ETCD_VERSION\?=v\d+\.\d+.\d+
     - path: images/build/cross/variants.yaml
       match: \d+\.\d+.\d+
 

images/build/cross/Makefile

@@ -24,7 +24,8 @@ TYPE ?= default
 GO_VERSION?=1.16.7
 BASEIMAGE?=golang:$(GO_VERSION)
 PROTOBUF_VERSION?=3.7.0
-ETCD_VERSION?=v3.4.13
+# TODO: Remove (along with `go1.15-legacy` variant) once Kubernetes 1.20 is EOL
+ETCD_VERSION?=v0.0.0
 
 IMAGE = $(REGISTRY)/$(IMGNAME)
 TAG ?= $(shell git describe --tags --always --dirty)

images/build/cross/default/Dockerfile

@@ -106,15 +106,6 @@ 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.
-ARG ETCD_VERSION
-RUN targetArch=$(echo $TARGETPLATFORM | cut -f2 -d '/') \
-  && 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-${targetArch}.tar.gz | tar -xz \
-  && chown -R $(id -u):$(id -g) /usr/local/src/etcd \
-  && ln -s ../src/etcd/etcd-${ETCD_VERSION}-linux-${targetArch}/etcd /usr/local/bin/
-
 # Cleanup a bit
 RUN apt-get -qqy remove \
       wget \

images/build/cross/variants.yaml

@@ -11,14 +11,14 @@ variants:
     GO_VERSION: '1.17rc2'
     IMAGE_VERSION: 'v1.17.0-rc.2-1'
     PROTOBUF_VERSION: '3.7.0'
-    ETCD_VERSION: 'v3.4.13'
   go1.16:
     TYPE: 'default'
     CONFIG: 'go1.16'
     GO_VERSION: '1.16.7'
     IMAGE_VERSION: 'v1.16.7-1'
     PROTOBUF_VERSION: '3.7.0'
-    ETCD_VERSION: 'v3.4.13'
+
+  # TODO: Remove (along with `ETCD_VERSION` in Makefile) once Kubernetes 1.20 is EOL
   go1.15-legacy:
     TYPE: 'legacy'
     CONFIG: 'go1.15'