Merge "Kubernetes: move to Kubernetes v1.7.5 gate"

ceph/values.yaml

@@ -26,7 +26,7 @@ images:
   bootstrap: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
   dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
   daemon: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
-  ceph_config_helper: docker.io/port/ceph-config-helper:v1.6.8
+  ceph_config_helper: docker.io/port/ceph-config-helper:v1.7.5
   rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1
   pull_policy: "IfNotPresent"
 

doc/source/install/developer/all-in-one.rst

@@ -69,7 +69,7 @@ against your Kubernetes cluster.
 
 ::
 
-      export KUBE_VERSION=v1.6.8
+      export KUBE_VERSION=v1.7.5
       export HELM_VERSION=v2.5.1
       export TMP_DIR=$(mktemp -d)
 
@@ -136,11 +136,11 @@ Build
 -----
 
 Using the Dockerfile defined in tools/kubeadm-aio directory, build the
-'openstackhelm/kubeadm-aio:v1.6.8' image.
+'openstackhelm/kubeadm-aio:v1.7.5' image.
 
 ::
 
-      export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.8
+      export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.7.5
       sudo docker build --pull -t ${KUBEADM_IMAGE} tools/kubeadm-aio
 
 CNI Configuration
@@ -166,7 +166,7 @@ displayed during execution.
 
 ::
 
-      export KUBE_VERSION=v1.6.8
+      export KUBE_VERSION=v1.7.5
       ./tools/kubeadm-aio/kubeadm-aio-launcher.sh
       export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf
       mkdir -p  ${HOME}/.kube

doc/source/install/multinode.rst

@@ -29,7 +29,7 @@ comments, please create an `issue
        - Version
        - Notes
      * - **Kubernetes**
-       - `v1.6.8 <https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v165>`_
+       - `v1.7.5 <https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v175>`_
        - `Custom Controller for RDB tools <https://quay.io/repository/attcomdev/kube-controller-manager?tab=tags>`_
      * - **Helm**
        - `v2.5.1 <https://github.com/kubernetes/helm/releases/tag/v2.5.1>`_
@@ -67,7 +67,7 @@ should just require a single command on the master node:
 
 ::
 
-    admin@kubenode01:~$ kubeadm init --kubernetes-version v1.6.8
+    admin@kubenode01:~$ kubeadm init --kubernetes-version v1.7.5
 
 
 If your environment looks like this after all nodes have joined the

tools/gate/vars.sh

@@ -24,7 +24,7 @@ export HOST_OS=${HOST_OS:="${ID}"}
 
 # Set versions of K8s and Helm to use
 export HELM_VERSION=${HELM_VERSION:-"v2.5.1"}
-export KUBE_VERSION=${KUBE_VERSION:-"v1.6.8"}
+export KUBE_VERSION=${KUBE_VERSION:-"v1.7.5"}
 
 # Set K8s-AIO options
 export KUBECONFIG=${KUBECONFIG:="${HOME}/.kubeadm-aio/admin.conf"}

tools/images/ceph-config-helper/Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 MAINTAINER pete.birley@att.com
 
-ARG KUBE_VERSION=v1.6.8
+ARG KUBE_VERSION=v1.7.5
 
 RUN set -x \
     && TMP_DIR=$(mktemp --directory) \

tools/images/ceph-config-helper/README.rst

@@ -31,7 +31,7 @@ repo run:
 
 .. code:: bash
 
-    export KUBE_VERSION=v1.6.8
+    export KUBE_VERSION=v1.7.5
     sudo docker build \
       --build-arg KUBE_VERSION=${KUBE_VERSION} \
       -t docker.io/port/ceph-config-helper:${KUBE_VERSION} \

tools/kubeadm-aio/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:16.04
 MAINTAINER pete.birley@att.com
 
 ENV HELM_VERSION=v2.5.1 \
-    KUBE_VERSION=v1.6.8 \
+    KUBE_VERSION=v1.7.5 \
     CNI_VERSION=v0.6.0-rc2 \
     container="docker" \
     DEBIAN_FRONTEND="noninteractive"

tools/kubeadm-aio/assets/etc/kubeadm.conf

@@ -1,4 +1,5 @@
 apiVersion: kubeadm.k8s.io/v1alpha1
 kind: MasterConfiguration
+kubernetesVersion: v1.7.5
 apiServerExtraArgs:
   runtime-config: "batch/v2alpha1=true"

tools/kubeadm-aio/assets/usr/bin/kubeadm-aio

@@ -15,6 +15,9 @@
 #    under the License.
 set -xe
 
+echo 'Starting the kubelet'
+systemctl start kubelet
+
 source /etc/kube-role
 if [[ "${KUBE_ROLE}" == "master" ]]; then
   # Source network vars
@@ -22,11 +25,9 @@ if [[ "${KUBE_ROLE}" == "master" ]]; then
 
   # Define k8s version
   source /etc/kube-version
-  if [[ "${KUBE_VERSION}" == "default" ]]; then
-    KUBE_VERSION_FLAG=""
-  else
-    KUBE_VERSION_FLAG="--kubernetes-version=${KUBE_VERSION}"
+  if ! [[ "${KUBE_VERSION}" == "default" ]]; then
     echo "We will use K8s ${KUBE_VERSION}"
+    sed -i "s|^kubernetesVersion: v1.7.5|kubernetesVersion: ${KUBE_VERSION}|g" /etc/kubeadm.conf
   fi
 
   echo 'Setting up K8s'
@@ -34,14 +35,14 @@ if [[ "${KUBE_ROLE}" == "master" ]]; then
   if [[ "$KUBE_BIND_DEV" != "autodetect" ]]; then
     KUBE_BIND_IP=$(ip addr list ${KUBE_BIND_DEV} |grep "inet " |cut -d' ' -f6|cut -d/ -f1)
     echo 'We are going to bind the K8s API to: ${KUBE_BIND_IP}'
-    kubeadm init ${KUBE_VERSION_FLAG} \
+    kubeadm init \
       --skip-preflight-checks \
-      --pod-network-cidr ${CNI_POD_CIDR} \
-      --api-advertise-addresses ${KUBE_BIND_IP}
+      --api-advertise-addresses ${KUBE_BIND_IP} \
+      --config /etc/kubeadm.conf
   else
-    kubeadm init ${KUBE_VERSION_FLAG} \
+    kubeadm init \
       --skip-preflight-checks \
-      --pod-network-cidr ${CNI_POD_CIDR}
+      --config /etc/kubeadm.conf
   fi
 
   echo 'Setting up K8s client'

tools/kubeadm-aio/assets/usr/bin/kubelet

@@ -24,7 +24,6 @@ CGROUP_DRIVER=$(docker info | awk '/^Cgroup Driver:/ { print $NF }')
 if [[ "${KUBELET_CONTAINER}" == "this_one" ]]; then
   exec kubelet-real \
         --containerized=true \
-        --enable-cri=false \
         --cgroup-driver=${CGROUP_DRIVER} "${@}"
 else
   # Lets remove any old containers
@@ -57,6 +56,5 @@ else
         ${KUBELET_CONTAINER} \
           kubelet \
             --containerized=true \
-            --enable-cri=false \
             --cgroup-driver=${CGROUP_DRIVER} "${@}"
 fi