Merge "k8s: Use the same kubectl version as API" into stable/train

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh

@@ -87,7 +87,6 @@ EnvironmentFile=/etc/kubernetes/config
 EnvironmentFile=/etc/kubernetes/apiserver
 ExecStartPre=/bin/mkdir -p /etc/kubernetes/
 ExecStartPre=-/usr/bin/podman rm kube-apiserver
-ExecStartPre=-/bin/bash -c '/usr/bin/podman run --privileged --user root --net host --entrypoint /bin/bash --rm --volume /usr/local/bin:/host/usr/local/bin \${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} -c "cp /usr/local/bin/kubectl /host/usr/local/bin/kubectl"'
 ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-apiserver \\
     --net host \\
     --entrypoint /hyperkube \\

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh

@@ -78,7 +78,6 @@ ExecStartPre=/bin/mkdir -p /var/lib/containerd
 ExecStartPre=/bin/mkdir -p /var/lib/docker
 ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
 ExecStartPre=/bin/mkdir -p /opt/cni/bin
-ExecStartPre=-/bin/bash -c '/usr/bin/podman run --privileged --user root --net host --entrypoint /bin/bash --rm --volume /usr/local/bin:/host/usr/local/bin \${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} -c "cp /usr/local/bin/kubectl /host/usr/local/bin/kubectl"'
 ExecStartPre=-/usr/bin/podman rm kubelet
 ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
     --privileged \\

magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+step="install-clients"
+printf "Starting to run ${step}\n"
+
+set -e
+set +x
+. /etc/sysconfig/heat-params
+set -x
+
+hyperkube_image="${CONTAINER_INFRA_PREFIX:-"k8s.gcr.io/"}hyperkube:${KUBE_TAG}"
+ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
+mkdir -p /srv/magnum/bin/
+i=0
+until ${ssh_cmd} "/usr/bin/podman run \
+    --entrypoint /bin/bash \
+    --name install-kubectl \
+    --net host \
+    --privileged \
+    --rm \
+    --user root \
+    --volume /srv/magnum/bin:/host/srv/magnum/bin \
+    ${hyperkube_image} \
+    -c 'cp /usr/local/bin/kubectl /host/srv/magnum/bin/kubectl'"
+do
+    i=$((i + 1))
+    if [ ${i} -gt 60 ] ; then
+        echo "ERROR Unable to install kubectl. Abort."
+        exit 1
+    fi
+    echo "WARNING Attempt ${i}: Trying to install kubectl. Sleeping 5s"
+    sleep 5s
+done
+echo "INFO Installed kubectl."
+
+echo "PATH=/srv/magnum/bin:\$PATH" >> /etc/bashrc
+
+printf "Finished running ${step}\n"

magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

@@ -801,6 +801,7 @@ resources:
                   "$CONTAINERD_TARBALL_URL": {get_param: containerd_tarball_url}
                   "$CONTAINERD_TARBALL_SHA256": {get_param: containerd_tarball_sha256}
             - get_file: ../../common/templates/kubernetes/fragments/install-cri.sh
+            - get_file: ../../common/templates/kubernetes/fragments/install-clients.sh
             - get_file: ../../common/templates/kubernetes/fragments/make-cert.sh
             - str_replace:
                 template: {get_file: ../../common/templates/kubernetes/fragments/enable-cert-api-manager.sh}

magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml

@@ -453,6 +453,7 @@ resources:
                   $CONTAINERD_TARBALL_URL: {get_param: containerd_tarball_url}
                   $CONTAINERD_TARBALL_SHA256: {get_param: containerd_tarball_sha256}
             - get_file: ../../common/templates/kubernetes/fragments/install-cri.sh
+            - get_file: ../../common/templates/kubernetes/fragments/install-clients.sh
             - get_file: ../../common/templates/kubernetes/fragments/write-kube-os-config.sh
             - get_file: ../../common/templates/kubernetes/fragments/make-cert-client.sh
             - get_file: ../../common/templates/fragments/configure-docker-registry.sh

magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml

@@ -814,6 +814,7 @@ resources:
                   "$CONTAINERD_TARBALL_URL": {get_param: containerd_tarball_url}
                   "$CONTAINERD_TARBALL_SHA256": {get_param: containerd_tarball_sha256}
             - get_file: ../../common/templates/kubernetes/fragments/install-cri.sh
+            - get_file: ../../common/templates/kubernetes/fragments/install-clients.sh
             - get_file: ../../common/templates/kubernetes/fragments/make-cert.sh
             - str_replace:
                 template: {get_file: ../../common/templates/kubernetes/fragments/enable-cert-api-manager.sh}

magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml

@@ -457,6 +457,7 @@ resources:
                   $CONTAINERD_TARBALL_URL: {get_param: containerd_tarball_url}
                   $CONTAINERD_TARBALL_SHA256: {get_param: containerd_tarball_sha256}
             - get_file: ../../common/templates/kubernetes/fragments/install-cri.sh
+            - get_file: ../../common/templates/kubernetes/fragments/install-clients.sh
             - get_file: ../../common/templates/kubernetes/fragments/write-kube-os-config.sh
             - get_file: ../../common/templates/kubernetes/fragments/make-cert-client.sh
             - get_file: ../../common/templates/fragments/configure-docker-registry.sh