Support etcd 3.3.10

etcd 3.3.10 is the etcd version recommended for 1.14

BUILD

@@ -50,3 +50,14 @@ gazelle(
     "etcd",
     "etcdctl",
 ]]
+
+[genrule(
+    name = "etcd-v3.3.10-linux-amd64_%s" % c,
+    srcs = ["@etcd_3_3_10_tar//file"],
+    outs = ["etcd-v3.3.10-linux-amd64/%s" % c],
+    cmd = "tar -x -z --no-same-owner -f ./$(location @etcd_3_2_24_tar//file) etcd-v3.3.10-linux-amd64/%s && mv etcd-v3.3.10-linux-amd64/%s \"$@\"" % (c, c),
+    visibility = ["//visibility:public"],
+) for c in [
+    "etcd",
+    "etcdctl",
+]]

WORKSPACE

@@ -77,6 +77,12 @@ http_file(
     urls = ["https://github.com/coreos/etcd/releases/download/v3.2.24/etcd-v3.2.24-linux-amd64.tar.gz"],
 )
 
+http_file(
+    name = "etcd_3_3_10_tar",
+    sha256 = "1620a59150ec0a0124a65540e23891243feb2d9a628092fb1edcc23974724a45",
+    urls = ["https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz"],
+)
+
 #=============================================================================
 # Build etcd from source
 # This picks up a number of critical bug fixes, for example:

images/BUILD

@@ -55,6 +55,16 @@ container_layer(
     ],
 )
 
+# Layer for etcd 3.3.10, updated recommendation for k8s 1.14 and later
+container_layer(
+    name = "etcd-3-3-10-layer",
+    directory = "/opt/etcd-v3.3.10-linux-amd64/",
+    files = [
+        "//:etcd-v3.3.10-linux-amd64_etcdctl",
+        "//:etcd-v3.3.10-linux-amd64_etcd",
+    ],
+)
+
 container_image(
     name = "etcd-manager-base",
     base = "@debian_base_amd64//image",
@@ -64,6 +74,7 @@ container_image(
         "etcd-3-1-12-layer",
         "etcd-3-2-18-layer",
         "etcd-3-2-24-layer",
+        "etcd-3-3-10-layer",
     ],
 )
 

test/integration/BUILD.bazel

@@ -20,6 +20,8 @@ go_test(
         "//:etcd-v3.2.18-linux-amd64_etcdctl",
         "//:etcd-v3.2.24-linux-amd64_etcd",
         "//:etcd-v3.2.24-linux-amd64_etcdctl",
+        "//:etcd-v3.3.10-linux-amd64_etcd",
+        "//:etcd-v3.3.10-linux-amd64_etcdctl",
     ],
     deps = [
         "//pkg/apis/etcd:go_default_library",

test/integration/clusterformation_test.go

@@ -17,7 +17,7 @@ func init() {
 	flag.Parse()
 }
 
-var AllEtcdVersions = []string{"2.2.1", "3.1.12", "3.2.18", "3.2.24"}
+var AllEtcdVersions = []string{"2.2.1", "3.1.12", "3.2.18", "3.2.24", "3.3.10"}
 
 func TestClusterWithOneMember(t *testing.T) {
 	for _, etcdVersion := range AllEtcdVersions {