Merge pull request #307 from ivan4th/update-for-k8s-1-14

Add support for k8s 1.14, drop k8s 1.10 and 1.11
kubernetes-retired · May 2, 2019 · 814d9ca · 814d9ca
2 parents 76f7b8a + 55606a9
commit 814d9ca
Show file tree

Hide file tree

Showing 14 changed files with 149 additions and 525 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,9 @@ services: docker
 language: minimal
 
 env:
-  - TEST_CASE=1.10
-  - TEST_CASE=1.11
   - TEST_CASE=1.12
   - TEST_CASE=1.13
+  - TEST_CASE=1.14
 
 before_install:
   - sudo apt-get -qq update

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ use `kubectl` 1.13.x with `hyperkube` 1.12.x). As an alternative,
 you can set `DOWNLOAD_KUBECTL` to a non-empty string in your
 config.sh so `kubeadm-dind-cluster` will download it for you.
 
-`kubeadm-dind-cluster` supports k8s versions 1.10.x through 1.13.x.
+`kubeadm-dind-cluster` supports k8s versions 1.12.x through 1.14.x.
 
 **As of now, running `kubeadm-dind-cluster` on Docker with `btrfs`
 storage driver is not supported.**
@@ -51,7 +51,7 @@ IPv6 and thus clusters cannot be formed using IPv6 addresses.
 
 ## Using preconfigured scripts
 `kubeadm-dind-cluster` currently provides preconfigured scripts for
-Kubernetes versions 1.10 through 1.13 published as part of GitHub
+Kubernetes versions 1.12 through 1.14 published as part of GitHub
 releases. Each preconfigured script is pinned to the corresponding
 image tag and SHA256 digest, so it will not be broken by changes
 in kubeadm-dind-cluster master branch.
@@ -88,7 +88,7 @@ $ # remove DIND containers and volumes
 $ ./dind-cluster-v1.13.sh clean
 ```
 
-Replace 1.13 with 1.10 .. 1.12 to use other Kubernetes versions.
+Replace 1.13 with 1.12 to use older Kubernetes versions.
 **Important note:** you need to do `./dind-cluster....sh clean` when
 you switch between Kubernetes versions (but no need to do this between
 rebuilds if you use `BUILD_HYPERKUBE=y` like described below).
@@ -543,7 +543,7 @@ that we have IPv6 available for the test cases. Note, that while internal IPv6
 is configured, external IPv6 is not available.
 
 There are two slightly different kind of tests which run for all version
-starting from `v1.10`:
+starting from `v1.12`:
 
 #### `TEST_K8S_VER='1.x' ./test/test-ipv6-only.sh`
 

diff --git a/build/buildconf.sh b/build/buildconf.sh
@@ -1,51 +1,41 @@
-# Version 1.10.13
-KUBEADM_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.13/bin/linux/amd64/kubeadm'
-KUBEADM_SHA1_1_10=a577dd72a1a4a1a82468d9ce2375c33e9a8a5adf
-HYPERKUBE_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.13/bin/linux/amd64/hyperkube'
-HYPERKUBE_SHA1_1_10=bb219f362e1e542fef6563c01c6556e55338c61e
-KUBECTL_LINUX_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.13/bin/linux/amd64/kubectl'
-KUBECTL_LINUX_SHA1_1_10=37c46a35edbe69e28a65a872e735c154402cd4a6
-KUBECTL_DARWIN_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.13/bin/darwin/amd64/kubectl'
-KUBECTL_DARWIN_SHA1_1_10=220b0dc38fd7c9a5aeb412589172020b6819e1b3
+# Version 1.12.8
+KUBEADM_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.8/bin/linux/amd64/kubeadm'
+KUBEADM_SHA1_1_12=c71653be73a66109b25f92322464ae7458557415
+HYPERKUBE_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.8/bin/linux/amd64/hyperkube'
+HYPERKUBE_SHA1_1_12=42f34ac1137fa9447c1a8fe4386886f1febf8e03
+KUBECTL_LINUX_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.8/bin/linux/amd64/kubectl'
+KUBECTL_LINUX_SHA1_1_12=7110f444d9a0e8f74d76c3d09e108f1641696149
+KUBECTL_DARWIN_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.8/bin/darwin/amd64/kubectl'
+KUBECTL_DARWIN_SHA1_1_12=cdd2169e5bbbccabf5e8f01afcb87b2381df7d2f
 
-# Version 1.11.7
-KUBEADM_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.7/bin/linux/amd64/kubeadm'
-KUBEADM_SHA1_1_11=9a98fff2414f93a93115fb8b304a6bba92e28a60
-HYPERKUBE_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.7/bin/linux/amd64/hyperkube'
-HYPERKUBE_SHA1_1_11=6b027bc6d0c2070ccda0e695880145e189c82f1e
-KUBECTL_LINUX_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.7/bin/linux/amd64/kubectl'
-KUBECTL_LINUX_SHA1_1_11=142b72418855b985b8a89e81f17df9d5fb88f1a9
-KUBECTL_DARWIN_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.7/bin/darwin/amd64/kubectl'
-KUBECTL_DARWIN_SHA1_1_11=9bd37b3eda2fae9f83cc7bcd584216f85ba17304
+# Version 1.13.5
+KUBEADM_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/linux/amd64/kubeadm'
+KUBEADM_SHA1_1_13=555423deada0f55b16030aecdbcbb59fac879e4a
+HYPERKUBE_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/linux/amd64/hyperkube'
+HYPERKUBE_SHA1_1_13=425618bce9c3291c6a65611fc2036ab522ffd48d
+KUBECTL_LINUX_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/linux/amd64/kubectl'
+KUBECTL_LINUX_SHA1_1_13=0e994d77be036cf9c7965f81248292dc8a11cd8c
+KUBECTL_DARWIN_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/darwin/amd64/kubectl'
+KUBECTL_DARWIN_SHA1_1_13=c99d60886cb6e68cb4725a930fca0421d9ee8732
 
-# Version 1.12.5
-KUBEADM_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.5/bin/linux/amd64/kubeadm'
-KUBEADM_SHA1_1_12=c62767b492bdf98bf90ead913dfad2e94dec80f4
-HYPERKUBE_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.5/bin/linux/amd64/hyperkube'
-HYPERKUBE_SHA1_1_12=26ca10c97011e96e5ca55deae3bce1f829e8d194
-KUBECTL_LINUX_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.5/bin/linux/amd64/kubectl'
-KUBECTL_LINUX_SHA1_1_12=fe8a1096c9a9167725eeb55ade4625b1fc67c270
-KUBECTL_DARWIN_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.5/bin/darwin/amd64/kubectl'
-KUBECTL_DARWIN_SHA1_1_12=715663dd9f2e34f2d195bc664174b17f51094740
-
-# Version 1.13.3
-KUBEADM_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubeadm'
-KUBEADM_SHA1_1_13=a89c340c5128be555d560f6cd18b450030c08f73
-HYPERKUBE_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/hyperkube'
-HYPERKUBE_SHA1_1_13=ce2fdb27fc32a06d8124b7e97cf61c21c1e2f02e
-KUBECTL_LINUX_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubectl'
-KUBECTL_LINUX_SHA1_1_13=6e332647317032e5982db98f4abf80c88c8b3de2
-KUBECTL_DARWIN_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/darwin/amd64/kubectl'
-KUBECTL_DARWIN_SHA1_1_13=45a1c5037f139af53e00a0c310bf04fa158a862e
+# Version 1.14.1
+KUBEADM_URL_1_14='https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubeadm'
+KUBEADM_SHA1_1_14=886e607321b4a7bf28d97e7833dcbfbb795d4613
+HYPERKUBE_URL_1_14='https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/hyperkube'
+HYPERKUBE_SHA1_1_14=0012a3c9a0259990be1e6659fc642c80e8b90e8d
+KUBECTL_LINUX_URL_1_14='https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl'
+KUBECTL_LINUX_SHA1_1_14=fd57c812083d5dde4745b3216453d0e1e4ee64df
+KUBECTL_DARWIN_URL_1_14='https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/darwin/amd64/kubectl'
+KUBECTL_DARWIN_SHA1_1_14=fd537d239de8e0c9b5625fe87e3e15bb8649b608
 
 # url and sha1sum of hyperkube binary -- only used for prebuilt hyperkube
-KUBEADM_URL=${KUBEADM_URL:-${KUBEADM_URL_1_13}}
-KUBEADM_SHA1=${KUBEADM_SHA1:-${KUBEADM_SHA1_1_13}}
-HYPERKUBE_URL=${HYPERKUBE_URL:-${HYPERKUBE_URL_1_13}}
-HYPERKUBE_SHA1=${HYPERKUBE_SHA1:-${HYPERKUBE_SHA1_1_13}}
-KUBECTL_LINUX_URL=${KUBECTL_LINUX_URL:-${KUBECTL_LINUX_URL_1_13}}
-KUBECTL_LINUX_SHA1=${KUBECTL_LINUX_SHA1:-${KUBECTL_LINUX_SHA1_1_13}}
-KUBECTL_DARWIN_URL=${KUBECTL_DARWIN_URL:-${KUBECTL_DARWIN_URL_1_13}}
-KUBECTL_DARWIN_SHA1=${KUBECTL_DARWIN_SHA1:-${KUBECTL_DARWIN_SHA1_1_13}}
+KUBEADM_URL=${KUBEADM_URL:-${KUBEADM_URL_1_14}}
+KUBEADM_SHA1=${KUBEADM_SHA1:-${KUBEADM_SHA1_1_14}}
+HYPERKUBE_URL=${HYPERKUBE_URL:-${HYPERKUBE_URL_1_14}}
+HYPERKUBE_SHA1=${HYPERKUBE_SHA1:-${HYPERKUBE_SHA1_1_14}}
+KUBECTL_LINUX_URL=${KUBECTL_LINUX_URL:-${KUBECTL_LINUX_URL_1_14}}
+KUBECTL_LINUX_SHA1=${KUBECTL_LINUX_SHA1:-${KUBECTL_LINUX_SHA1_1_14}}
+KUBECTL_DARWIN_URL=${KUBECTL_DARWIN_URL:-${KUBECTL_DARWIN_URL_1_14}}
+KUBECTL_DARWIN_SHA1=${KUBECTL_DARWIN_SHA1:-${KUBECTL_DARWIN_SHA1_1_14}}
 
-K8S_VERSIONS="1.10 1.11 1.12 1.13"
+K8S_VERSIONS="1.12 1.13 1.14"
diff --git a/build/genfixed.sh b/build/genfixed.sh
@@ -29,7 +29,7 @@ fi
 fixed_dir="${DIND_ROOT}/fixed"
 mkdir -p "${fixed_dir}"
 
-for tag in v1.10 v1.11 v1.12 v1.13; do
+for tag in v1.12 v1.13 v1.14; do
   dest="${fixed_dir}/dind-cluster-${tag}.sh"
   commit="$(cd "${DIND_ROOT}"; git rev-parse HEAD)"
   image="mirantis/kubeadm-dind-cluster:${commit}-${tag}"

diff --git a/build/genvars.sh b/build/genvars.sh
@@ -17,7 +17,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 set -o errtrace
-VERSIONS=(1.10.13 1.11.7 1.12.5 1.13.3)
+VERSIONS=(1.12.8 1.13.5 1.14.1)
 
 first=1
 for version in ${VERSIONS[@]}; do

diff --git a/build/update-test-matrix.sh b/build/update-test-matrix.sh
@@ -30,26 +30,23 @@ DIND_ROOT=$(dirname "${BASH_SOURCE}")/..
 test_matrix=(
     # "No defaults" should be set for the tests with machine executor
     # Test name                  k8s   CNI         CRI        No defaults
-    "test                        v1.10                          "
-    "test                        v1.10 bridge      containerd   "
-    "test                        v1.11                          "
-    "test                        v1.11 bridge      containerd   "
-    "test                        v1.11 kube-router              "
     "test                        v1.12                          "
     "test                        v1.12 bridge      containerd   "
     "test                        v1.13                          "
-    "test                        v1.13 flannel                  "
-    "test                        v1.13 calico                   "
-    "test                        v1.13 calico-kdd               "
-    "test                        v1.13 weave                    "
     "test                        v1.13 bridge      containerd   "
-    "test                        v1.13 ptp                      "
-    "test_multiple_clusters      v1.13                          "
-    "test_ipv4_only              v1.13 bridge      docker      y"
-    "test_ipv6_only              v1.13 bridge      docker      y"
-    "test_ipv6_only_nat64        v1.13 bridge      docker      y"
-    "test_ipv6_only_ext_aaaa     v1.13 bridge      docker      y"
-    "test_dual_stack_v4_svc_net  v1.13 bridge      docker      y"
+    "test                        v1.14                          "
+    "test                        v1.14 flannel                  "
+    "test                        v1.14 calico                   "
+    "test                        v1.14 calico-kdd               "
+    "test                        v1.14 weave                    "
+    "test                        v1.14 bridge      containerd   "
+    "test                        v1.14 ptp                      "
+    "test_multiple_clusters      v1.14                          "
+    "test_ipv4_only              v1.14 bridge      docker      y"
+    "test_ipv6_only              v1.14 bridge      docker      y"
+    "test_ipv6_only_nat64        v1.14 bridge      docker      y"
+    "test_ipv6_only_ext_aaaa     v1.14 bridge      docker      y"
+    "test_dual_stack_v4_svc_net  v1.14 bridge      docker      y"
     "test_src_release                                           "
     "test_src_master                                            "
 )

diff --git a/dind-cluster.sh b/dind-cluster.sh
@@ -591,8 +591,8 @@ function dind::retry {
   "$@"
 }
 
-busybox_image="busybox:1.26.2"
-e2e_base_image="golang:1.10.5"
+busybox_image="busybox:1.30.1"
+e2e_base_image="golang:1.12.4"
 sys_volume_args=()
 build_volume_args=()
 
@@ -1263,12 +1263,6 @@ function dind::init {
 
   kubeadm_version="$(dind::kubeadm-version)"
   case "${kubeadm_version}" in
-    1\.9\.* | 1\.10\.*)
-      template="1.10"
-      ;;
-    1\.11\.*)
-      template="1.11"
-      ;;
     1\.12\.*)
       template="1.12"
       ;;
@@ -1332,7 +1326,8 @@ EOF
   if [[ ${BUILD_KUBEADM} || ${BUILD_HYPERKUBE} ]]; then
     docker exec "$master_name" mount --make-shared /k8s
   fi
-  kubeadm_join_flags="$(dind::kubeadm "${container_id}" init "${init_args[@]}" --ignore-preflight-errors=all "$@" | grep -A1 'kubeadm join.*--token' | sed 's/^.*kubeadm join //; s/\\$//; N; s/\n//')"
+  dind::kubeadm "${container_id}" init "${init_args[@]}" --ignore-preflight-errors=all "$@"
+  kubeadm_join_flags="$(docker exec "${container_id}" kubeadm token create --print-join-command | sed 's/^kubeadm join //')"
   dind::configure-kubectl
   dind::start-port-forwarder
 }

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -118,8 +118,6 @@ COPY start_services /usr/local/bin/
 COPY rundocker /usr/local/bin
 COPY dindnet /usr/local/bin
 COPY snapshot /usr/local/bin
-COPY kubeadm.conf.1.10.tmpl /etc/kubeadm.conf.1.10.tmpl
-COPY kubeadm.conf.1.11.tmpl /etc/kubeadm.conf.1.11.tmpl
 COPY kubeadm.conf.1.12.tmpl /etc/kubeadm.conf.1.12.tmpl
 COPY kubeadm.conf.1.13.tmpl /etc/kubeadm.conf.1.13.tmpl
 COPY dind-cluster-rbd /usr/bin/rbd

diff --git a/image/kubeadm.conf.1.10.tmpl b/image/kubeadm.conf.1.10.tmpl