Merge pull request #273 from ivan4th/k8s-1.13-and-releases

Add support for k8s 1.13 and introduce releases

Author: k8s-ci-robot

.circleci/config.yml

@@ -3,10 +3,10 @@ services: docker
 language: minimal
 
 env:
-  - TEST_CASE=1.9
   - TEST_CASE=1.10
   - TEST_CASE=1.11
   - TEST_CASE=1.12
+  - TEST_CASE=1.13
 
 before_install:
   - sudo apt-get -qq update

.travis.yml

@@ -1,5 +1,7 @@
 FROM mirantis/kubeadm-dind-cluster:bare-v4
 
+LABEL mirantis.kubeadm_dind_cluster_final=1
+
 # the following args should be set for derived images
 
 #Todo: download prebuilt hyperkube (not kubectl!) & kubeadm into /k8s
@@ -8,6 +10,11 @@ ARG KUBEADM_URL
 ARG KUBEADM_SHA1
 ARG HYPERKUBE_URL
 ARG HYPERKUBE_SHA1
+ARG KUBECTL_VERSION
+ARG KUBECTL_LINUX_URL
+ARG KUBECTL_LINUX_SHA1
+ARG KUBECTL_DARWIN_URL
+ARG KUBECTL_DARWIN_SHA1
 
 RUN if [ -n "${KUBEADM_URL}" ]; then \
       mkdir -p /k8s && \
@@ -19,7 +26,12 @@ RUN if [ -n "${KUBEADM_URL}" ]; then \
       curl -sSL "${HYPERKUBE_URL}" > /k8s/hyperkube && \
       if [ -n "${HYPERKUBE_SHA1}" ]; then echo "${HYPERKUBE_SHA1}  /k8s/hyperkube" | sha1sum -c; fi && \
       chmod +x /k8s/hyperkube; \
-    fi
+    fi && \
+    ( echo "export KUBECTL_VERSION=${KUBECTL_VERSION}" && \
+      echo "export KUBECTL_LINUX_SHA1=${KUBECTL_LINUX_SHA1}" && \
+      echo "export KUBECTL_LINUX_URL=${KUBECTL_LINUX_URL}" && \
+      echo "export KUBECTL_DARWIN_SHA1=${KUBECTL_DARWIN_SHA1}" && \
+      echo "export KUBECTL_DARWIN_URL=${KUBECTL_DARWIN_URL}" ) >/dind-env
 COPY save.tar.lz4 /
 
 ENTRYPOINT ["/sbin/dind_init"]

Dockerfile

@@ -19,9 +19,11 @@ Docker 1.12+ is recommended. If you're not using one of the
 preconfigured scripts (see below) and not building from source, it's
 better to have `kubectl` executable in your path matching the
 version of k8s binaries you're using (i.e. for example better don't
-use `kubectl` 1.10.x with `hyperkube` 1.9.x).
+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.9.x through 1.12.x.
+`kubeadm-dind-cluster` supports k8s versions 1.10.x through 1.13.x.
 
 **As of now, running `kubeadm-dind-cluster` on Docker with `btrfs`
 storage driver is not supported.**
@@ -49,39 +51,44 @@ IPv6 and thus clusters cannot be formed using IPv6 addresses.
 
 ## Using preconfigured scripts
 `kubeadm-dind-cluster` currently provides preconfigured scripts for
-Kubernetes versions 1.9 through 1.12. This may be convenient for use with
-projects that extend or use Kubernetes. For example, you can start
-Kubernetes 1.12 like this:
+Kubernetes versions 1.10 through 1.13 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.
+
+The preconfigured scripts are convenient for use with projects that
+extend or use Kubernetes. For example, you can start Kubernetes 1.13
+like this:
 
 ```shell
-$ wget https://cdn.rawgit.com/kubernetes-sigs/kubeadm-dind-cluster/master/fixed/dind-cluster-v1.12.sh
-$ chmod +x dind-cluster-v1.12.sh
+$ wget https://github.com/kubernetes-sigs/kubeadm-dind-cluster/releases/download/v0.1.0/dind-cluster-v1.13.sh
+$ chmod +x dind-cluster-v1.13.sh
 
 $ # start the cluster
-$ ./dind-cluster-v1.12.sh up
+$ ./dind-cluster-v1.13.sh up
 
 $ # add kubectl directory to PATH
 $ export PATH="$HOME/.kubeadm-dind-cluster:$PATH"
 
 $ kubectl get nodes
 NAME          STATUS    ROLES     AGE       VERSION
-kube-master   Ready     master    4m        v1.12.1
-kube-node-1   Ready     <none>    2m        v1.12.1
-kube-node-2   Ready     <none>    2m        v1.12.1
+kube-master   Ready     master    4m        v1.13.0
+kube-node-1   Ready     <none>    2m        v1.13.0
+kube-node-2   Ready     <none>    2m        v1.13.0
 
 $ # k8s dashboard available at http://localhost:8080/api/v1/namespaces/kube-system/services/kubernetes-dashboard:/proxy
 
 $ # restart the cluster, this should happen much quicker than initial startup
-$ ./dind-cluster-v1.12.sh up
+$ ./dind-cluster-v1.13.sh up
 
 $ # stop the cluster
-$ ./dind-cluster-v1.12.sh down
+$ ./dind-cluster-v1.13.sh down
 
 $ # remove DIND containers and volumes
-$ ./dind-cluster-v1.12.sh clean
+$ ./dind-cluster-v1.13.sh clean
 ```
 
-Replace 1.12 with 1.9 .. 1.11 to use other Kubernetes versions.
+Replace 1.13 with 1.10 .. 1.12 to use other 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).
@@ -196,8 +203,8 @@ To use kube-router, set the CNI_PLUGIN environment variable to "kube-router".
 NOTE: Currently pinning kube-router to v0.2.0, because of issue seen with
 cleanup, when using newer (latest) kube-router.
 
-NOTE: This has only been tested with Kubernetes 1.11, and currently fails,
-when using Kuberentes 1.12 (alpha).
+NOTE: This has only been tested with Kubernetes 1.11, and currently fails
+when using Kuberentes 1.12+
 
 ## IPv6 Mode
 To run Kubernetes in IPv6 only mode, set the environment variable IP_MODE
@@ -509,6 +516,8 @@ case also locally, by just calling the script:
 $ DIND_ALLOW_AAAA_USE='true' TEST_K8S_VER='v1.10' ./test/test-ipv6-only.sh
 ```
 
+CircleCI config can be re-generated using `build/update-test-matrix.sh`
+
 #### TravisCI, `./test.sh`
 
 There are some tests in `./test.sh`, those will run on TravisCI.
@@ -534,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.9`:
+starting from `v1.10`:
 
 #### `TEST_K8S_VER='1.x' ./test/test-ipv6-only.sh`
 

README.md

@@ -0,0 +1,49 @@
+#!/bin/bash
+# Copyright 2018 Mirantis
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o errtrace
+
+save_to_dir="${1:-}"
+
+DIND_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "$DIND_ROOT/build/funcs.sh"
+
+dind::build-base
+images_to_save=(${BARE_IMAGE_NAME})
+for v in ${K8S_VERSIONS}; do
+  version="${v//./_}"
+  eval "HYPERKUBE_URL=\${HYPERKUBE_URL_${version}}"
+  eval "HYPERKUBE_SHA1=\${HYPERKUBE_SHA1_${version}}"
+  eval "KUBEADM_URL=\${KUBEADM_URL_${version}}"
+  eval "KUBEADM_SHA1=\${KUBEADM_SHA1_${version}}"
+  eval "KUBECTL_LINUX_URL=\${KUBECTL_LINUX_URL_${version}}"
+  eval "KUBECTL_LINUX_SHA1=\${KUBECTL_LINUX_SHA1_${version}}"
+  eval "KUBECTL_DARWIN_URL=\${KUBECTL_DARWIN_URL_${version}}"
+  eval "KUBECTL_DARWIN_SHA1=\${KUBECTL_DARWIN_SHA1_${version}}"
+  commit="$(git rev-parse HEAD)"
+  tag="${commit}-v${v}"
+  cur_image="${IMAGE_NAME}:${tag}"
+  dind::build-image "${cur_image}"
+  images_to_save+=("${cur_image}")
+done
+if [[ ${save_to_dir} ]]; then
+  mkdir -p _save
+  docker save "${images_to_save[@]}" >_save/images.tar
+else
+  echo "${images_to_save[*]}"
+fi

build/build-all.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2017 Mirantis
+# Copyright 2018 Mirantis
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/build-local.sh

@@ -1,45 +1,51 @@
-# Version 1.9.11
-KUBEADM_URL_1_9='https://storage.googleapis.com/kubernetes-release/release/v1.9.11/bin/linux/amd64/kubeadm'
-KUBEADM_SHA1_1_9=152e1dd6261f5e1aeda982fb3a5d17255860a830
-HYPERKUBE_URL_1_9='https://storage.googleapis.com/kubernetes-release/release/v1.9.11/bin/linux/amd64/hyperkube'
-HYPERKUBE_SHA1_1_9=d23dc80fa2cd5f845912721afffba0e8fd9b1780
-KUBECTL_URL_1_9='https://storage.googleapis.com/kubernetes-release/release/v1.9.11/bin/linux/amd64/kubectl'
-KUBECTL_SHA1_1_9=3dedd41a077be12668c2ee322958dd3e9e554861
-KUBECTL_DARWIN_URL_1_9='https://storage.googleapis.com/kubernetes-release/release/v1.9.11/bin/darwin/amd64/kubectl'
-KUBECTL_DARWIN_SHA1_1_9=3b436f60ff0399b3f521d549044513358487ce20
+# Version 1.10.11
+KUBEADM_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.11/bin/linux/amd64/kubeadm'
+KUBEADM_SHA1_1_10=d80c4d591ae61f60fb8c22dca2a9ef7dd6412dd9
+HYPERKUBE_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.11/bin/linux/amd64/hyperkube'
+HYPERKUBE_SHA1_1_10=13a9ebddd89332d5937cc9215bd1c446d4e663af
+KUBECTL_LINUX_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.11/bin/linux/amd64/kubectl'
+KUBECTL_LINUX_SHA1_1_10=9ee2f78491cbf8dc76d644c23cfc8c955c34d55d
+KUBECTL_DARWIN_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.11/bin/darwin/amd64/kubectl'
+KUBECTL_DARWIN_SHA1_1_10=1cfafe21222e7f5f809ba4e3e7a1471421998d37
 
-# Version 1.10.9
-KUBEADM_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.9/bin/linux/amd64/kubeadm'
-KUBEADM_SHA1_1_10=5d300647b0512cc724248431211df92a4b6f987f
-HYPERKUBE_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.9/bin/linux/amd64/hyperkube'
-HYPERKUBE_SHA1_1_10=a1899c421d3192f647ee6fa3927207bffdffbb6b
-KUBECTL_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.9/bin/linux/amd64/kubectl'
-KUBECTL_SHA1_1_10=bf3914630fe45b4f9ec1bc5e56f10fb30047f958
-KUBECTL_DARWIN_URL_1_10='https://storage.googleapis.com/kubernetes-release/release/v1.10.9/bin/darwin/amd64/kubectl'
-KUBECTL_DARWIN_SHA1_1_10=6833874e0b24fa1857925423e4dc8aeaa322b7b3
+# Version 1.11.5
+KUBEADM_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.5/bin/linux/amd64/kubeadm'
+KUBEADM_SHA1_1_11=daec1f0ddd654ab2b7553312548e545623037366
+HYPERKUBE_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.5/bin/linux/amd64/hyperkube'
+HYPERKUBE_SHA1_1_11=ddeddb33dfc581bdc3e101d7b17dc1dd2279657f
+KUBECTL_LINUX_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.5/bin/linux/amd64/kubectl'
+KUBECTL_LINUX_SHA1_1_11=feebec8e5649223e586fc45850d8659274c87797
+KUBECTL_DARWIN_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.5/bin/darwin/amd64/kubectl'
+KUBECTL_DARWIN_SHA1_1_11=450e6e17fe65e9d24cbbe39702ad7aa9103662d7
 
-# Version 1.11.3
-KUBEADM_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.3/bin/linux/amd64/kubeadm'
-KUBEADM_SHA1_1_11=f127dccad906ee914af8b889bb60c07f402ed025
-HYPERKUBE_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.3/bin/linux/amd64/hyperkube'
-HYPERKUBE_SHA1_1_11=4510415132722eed1add98c3352d7fa171667739
-KUBECTL_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.3/bin/linux/amd64/kubectl'
-KUBECTL_SHA1_1_11=5a336ea470a0053b1893fda89a538b6197566137
-KUBECTL_DARWIN_URL_1_11='https://storage.googleapis.com/kubernetes-release/release/v1.11.3/bin/darwin/amd64/kubectl'
-KUBECTL_DARWIN_SHA1_1_11=4f519f6c225f2dd663a26c5c2390849324a577cb
+# Version 1.12.3
+KUBEADM_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.3/bin/linux/amd64/kubeadm'
+KUBEADM_SHA1_1_12=24d78afbd6bb3dc90cd048a1925eccc7cb4b05db
+HYPERKUBE_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.3/bin/linux/amd64/hyperkube'
+HYPERKUBE_SHA1_1_12=c7ba79dff169b49beff3e8d2943a58adb6bcd7d1
+KUBECTL_LINUX_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.3/bin/linux/amd64/kubectl'
+KUBECTL_LINUX_SHA1_1_12=4248b9e621af7e902c9d23bf772a2ee8e50146c5
+KUBECTL_DARWIN_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.3/bin/darwin/amd64/kubectl'
+KUBECTL_DARWIN_SHA1_1_12=c7d4086fbdc58d81419f7643304de0bf356e11df
 
-# Version 1.12.1
-KUBEADM_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.1/bin/linux/amd64/kubeadm'
-KUBEADM_SHA1_1_12=8f7de5a0236614bb89217b110368974dc19c78ec
-HYPERKUBE_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.1/bin/linux/amd64/hyperkube'
-HYPERKUBE_SHA1_1_12=2212a4ab6091cdd4205c9b716886619d79eb8daf
-KUBECTL_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.1/bin/linux/amd64/kubectl'
-KUBECTL_SHA1_1_12=2135356e8e205816829f612062e1b5b4e1c81a17
-KUBECTL_DARWIN_URL_1_12='https://storage.googleapis.com/kubernetes-release/release/v1.12.1/bin/darwin/amd64/kubectl'
-KUBECTL_DARWIN_SHA1_1_12=a99adb19c1fa0334ab9be37b3918e5de84436acd
+# Version 1.13.0
+KUBEADM_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/amd64/kubeadm'
+KUBEADM_SHA1_1_13=c40dccc3d6fd0b7a903b0663c7ecd84f37105a2f
+HYPERKUBE_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/amd64/hyperkube'
+HYPERKUBE_SHA1_1_13=ce1d5c8a0d0f3afa506f624db7337452ac4c562f
+KUBECTL_LINUX_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/amd64/kubectl'
+KUBECTL_LINUX_SHA1_1_13=5c619006fa45afce6efc51db819aff7d5ba7ef0e
+KUBECTL_DARWIN_URL_1_13='https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/darwin/amd64/kubectl'
+KUBECTL_DARWIN_SHA1_1_13=264df4722e8f70301dd150d455baeae4a855d2fc
 
 # url and sha1sum of hyperkube binary -- only used for prebuilt hyperkube
-KUBEADM_URL=${KUBEADM_URL:-${KUBEADM_URL_1_12}}
-KUBEADM_SHA1=${KUBEADM_SHA1:-${KUBEADM_SHA1_1_12}}
-HYPERKUBE_URL=${HYPERKUBE_URL:-${HYPERKUBE_URL_1_12}}
-HYPERKUBE_SHA1=${HYPERKUBE_SHA1:-${HYPERKUBE_SHA1_1_12}}
+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}}
+
+K8S_VERSIONS="1.10 1.11 1.12 1.13"

build/buildconf.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2017 Mirantis
+# Copyright 2018 Mirantis
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,11 +16,15 @@
 source "${DIND_ROOT}/build/buildconf.sh"
 
 IMAGE_CACHE_DIR="${IMAGE_CACHE_DIR:-}"
+IMAGE_NAME="${IMAGE_NAME:-mirantis/kubeadm-dind-cluster}"
 
 KUBEADM_URL="${KUBEADM_URL:-}"
 HYPERKUBE_URL="${HYPERKUBE_URL:-}"
 KUBEADM_SHA1=${KUBEADM_SHA1:-}
 HYPERKUBE_SHA1=${HYPERKUBE_SHA1:-}
+GH_RELEASE_USER="kubernetes-sigs"
+GH_REPO="kubeadm-dind-cluster"
+GH_RELEASE_TEST_USER="ivan4th"
 
 # FIXME: use k8s version specific list of images to pre-pull
 # prepull_images=(gcr.io/google_containers/etcd-amd64:3.0.17
@@ -109,11 +113,64 @@ function dind::build-image {
     dind::build-hypokube
     images+=("${hypokube_base_image}")
 
+    if [[ ${KUBECTL_LINUX_URL} =~ /(v[0-9.]*)/ ]]; then
+        kubectl_version="${BASH_REMATCH[1]}"
+    else
+        echo >&2 "can't get kubectl version from url: ${KUBECTL_LINUX_URL}"
+        exit 1
+    fi
+
     dind::copy-saved-images save.tar.lz4 "${images[@]}"
     docker build -t "${name}" \
            --build-arg KUBEADM_URL="${KUBEADM_URL}" \
            --build-arg KUBEADM_SHA1="${KUBEADM_SHA1}" \
            --build-arg HYPERKUBE_URL="${HYPERKUBE_URL}" \
            --build-arg HYPERKUBE_SHA1="${HYPERKUBE_SHA1}" \
+           --build-arg KUBECTL_VERSION=${kubectl_version} \
+           --build-arg KUBECTL_LINUX_SHA1="${KUBECTL_LINUX_SHA1}" \
+           --build-arg KUBECTL_LINUX_URL="${KUBECTL_LINUX_URL}" \
+           --build-arg KUBECTL_DARWIN_SHA1="${KUBECTL_DARWIN_SHA1}" \
+           --build-arg KUBECTL_DARWIN_URL="${KUBECTL_DARWIN_URL}" \
            .
 }
+
+function release_description {
+    local -a tag="${1}"
+    shift
+    git tag -l --format='%(contents:body)' "${tag}"
+    echo
+    echo "SHA256 sums for the files:"
+    echo '```'
+    (cd fixed && sha256sum "$@")
+    echo '```'
+}
+
+function release {
+    local tag="${1}"
+    shift
+    local gh_user="${GH_RELEASE_USER}"
+    if [[ ${tag} =~ test ]]; then
+        gh_user="${GH_RELEASE_TEST_USER}"
+    fi
+    local -a opts=(--user "${gh_user}" --repo "${GH_REPO}" --tag "${tag}")
+    local -a files=($(cd fixed && ls dind-cluster-v*.sh))
+    local description="$(release_description "${tag}" "${files[@]}")"
+    local pre_release=
+    if [[ ${tag} =~ -(test|pre).*$ ]]; then
+        pre_release="--pre-release"
+    fi
+    if github-release --quiet delete "${opts[@]}"; then
+        echo >&2 "Replacing the old release"
+    fi
+    github-release release "${opts[@]}" \
+                   --name "$(git tag -l --format='%(contents:subject)' "${tag}")" \
+                   --description "${description}" \
+                   ${pre_release}
+    for filename in "${files[@]}"; do
+        echo >&2 "Uploading: ${filename}"
+        github-release upload "${opts[@]}" \
+                       --name "${filename}" \
+                       --replace \
+                       --file "fixed/${filename}"
+    done
+}