Merge pull request #2381 from travisn/add-remove-k8s-tests
Remove 1.8 and 1.9 and add 1.13 to integration tests
This commit is contained in:
14 files changed
+21
-135
No files matched your search
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash +e
|
||||
|
||||
KUBE_VERSION=${1:-"v1.8.5"}
|
||||
KUBE_VERSION=${1:-"v1.13.1"}
|
||||
|
||||
null_str=
|
||||
KUBE_INSTALL_VERSION="${KUBE_VERSION/v/$null_str}"-00
|
||||
|
||||
@@ -5,9 +5,9 @@ scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
tarname=image.tar
|
||||
tarfile="${WORK_DIR}/tests/${tarname}"
|
||||
|
||||
export KUBE_VERSION=${KUBE_VERSION:-"v1.8.5"}
|
||||
export KUBE_VERSION=${KUBE_VERSION:-"v1.13.1"}
|
||||
|
||||
if [[ $KUBE_VERSION == v1.12* ]] ; then
|
||||
if [[ $KUBE_VERSION != v1.10* && $KUBE_VERSION != v1.11* ]] ; then
|
||||
skippreflightcheck=--ignore-preflight-errors=all
|
||||
else
|
||||
skippreflightcheck=--skip-preflight-checks
|
||||
@@ -25,15 +25,6 @@ usage(){
|
||||
#install k8s master node
|
||||
install_master(){
|
||||
|
||||
if [[ $KUBE_VERSION == v1.8* ]] ; then
|
||||
# for k8s 1.8, use a non default value for volume plugins
|
||||
cat << EOF | sudo tee -a /etc/systemd/system/kubelet.service.d/11-volume_plugin_dir.conf
|
||||
[Service]
|
||||
Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
|
||||
EOF
|
||||
sudo systemctl daemon-reload
|
||||
fi
|
||||
|
||||
sudo kubeadm init $skippreflightcheck --kubernetes-version ${KUBE_VERSION}
|
||||
|
||||
sudo cp /etc/kubernetes/admin.conf $HOME/
|
||||
@@ -66,16 +57,6 @@ EOF
|
||||
#install k8s node
|
||||
install_node(){
|
||||
echo "inside install node function"
|
||||
|
||||
# for k8s 1.8, use a non default value for volume plugins
|
||||
if [[ $KUBE_VERSION == v1.8* ]] ; then
|
||||
cat << EOF | sudo tee -a /etc/systemd/system/kubelet.service.d/11-volume_plugin_dir.conf
|
||||
[Service]
|
||||
Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
|
||||
EOF
|
||||
sudo systemctl daemon-reload
|
||||
fi
|
||||
|
||||
echo "kubeadm join ${1} ${2} ${3} ${4} ${5} $skippreflightcheck"
|
||||
sudo kubeadm join ${1} ${2} ${3} ${4} ${5} $skippreflightcheck || true
|
||||
}
|
||||
|
||||
@@ -120,13 +120,11 @@ function copy_images() {
|
||||
}
|
||||
|
||||
# configure minikube
|
||||
# ** K8s v1.12 requires at least minikube v0.30.0 **
|
||||
KUBE_VERSION=${KUBE_VERSION:-"v1.12.2"}
|
||||
KUBE_VERSION=${KUBE_VERSION:-"v1.13.1"}
|
||||
MEMORY=${MEMORY:-"3000"}
|
||||
|
||||
case "${1:-}" in
|
||||
up)
|
||||
# Use kubeadm bootstrapper for 1.8+ since localkube was deprecated in 1.8
|
||||
echo "starting minikube with kubeadm bootstrapper"
|
||||
minikube start --memory="${MEMORY}" -b kubeadm --kubernetes-version "${KUBE_VERSION}"
|
||||
wait_for_ssh
|
||||
|
||||
@@ -36,8 +36,7 @@ MEMORY=${MEMORY:-"3000"}
|
||||
|
||||
case "${1:-}" in
|
||||
up)
|
||||
# Use kubeadm bootstrapper for 1.9+ since localkube was deprecated in 1.8
|
||||
echo "starting minishift with localkube bootstrapper"
|
||||
echo "starting minishift"
|
||||
minishift start --memory=${MEMORY} --vm-driver=virtualbox --iso-url centos
|
||||
wait_for_ssh
|
||||
|
||||
|
||||
Reference in new issue
Block a user