Merge pull request #345 from dholt/release-1909

Release 19.10

ansible.cfg

@@ -13,6 +13,7 @@ stdout_callback = yaml
 bin_ansible_callbacks = True
 local_tmp=/tmp
 remote_tmp=/tmp
+forks = 25
 
 [ssh_connection]
 pipelining = True

playbooks/docker.yml

@@ -24,8 +24,7 @@
         name: docker
       vars:
         # matches: kubespray/roles/container-engine/docker/vars/ubuntu-amd64.yml
-        #docker_package: 'docker-ce=18.06.1~ce~3-0~ubuntu'
-        docker_package: 'docker-ce=5:18.09.5~3-0~ubuntu-{{ ansible_distribution_release }}'
+        docker_package: 'docker-ce=5:18.09.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}'
       when:
         - ansible_distribution == "Ubuntu"
         - ansible_product_name is not search("DGX-1") and ansible_product_name is not search("DGX-2")
@@ -35,8 +34,7 @@
         name: docker
       vars:
         # matches: kubespray/roles/container-engine/docker/vars/redhat.yml
-        #docker_package: 'docker-ce-18.06.2.ce-3.el7'
-        docker_package: 'docker-ce-18.09.5-3.el7'
+        docker_package: 'docker-ce-18.09.7-3.el7'
       when:
         - ansible_os_family == "RedHat"
         - ansible_product_name is not search("DGX-1") and ansible_product_name is not search("DGX-2")

scripts/install_helm.sh

@@ -5,8 +5,7 @@ set -x
 HELM_INSTALL_DIR=/usr/local/bin
 HELM_INSTALL_SCRIPT_URL="${HELM_INSTALL_SCRIPT_URL:-https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get}"
 
-kubectl version
-if [ $? -ne 0 ] ; then
+if ! kubectl version ; then
     echo "Unable to talk to Kubernetes API"
     exit 1
 fi
@@ -41,7 +40,7 @@ if ! type helm >/dev/null 2>&1 ; then
     chmod +x /tmp/get_helm.sh
     #sed -i 's/sudo//g' /tmp/get_helm.sh
     mkdir -p ${HELM_INSTALL_DIR}
-    HELM_INSTALL_DIR=${HELM_INSTALL_DIR} DESIRED_VERSION=v2.11.0 /tmp/get_helm.sh
+    HELM_INSTALL_DIR=${HELM_INSTALL_DIR} DESIRED_VERSION=v2.14.3 /tmp/get_helm.sh
 fi
 
 helm_extra_args=""
@@ -51,6 +50,7 @@ fi
 
 if type helm >/dev/null 2>&1 ; then
     helm init --client-only ${helm_extra_args}
+    helm repo update
 else
     echo "Helm client not installed"
     exit 1

scripts/k8s_deploy_ingress.sh

@@ -4,7 +4,9 @@ set -x
 # Get absolute path for script and root
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 ROOT_DIR="${SCRIPT_DIR}/.."
-CHART_VERSION="1.4.0"
+CHART_VERSION="1.22.1"
+
+./scripts/install_helm.sh
 
 # Allow overriding the app name with an env var
 app_name="${NGINX_INGRESS_APP_NAME:-nginx-ingress}"
@@ -18,19 +20,18 @@ if [ ! -d "${config_dir}" ]; then
 	exit 1
 fi
 
-kubectl version
-if [ $? -ne 0 ] ; then
+if ! kubectl version ; then
     echo "Unable to talk to Kubernetes API"
     exit 1
 fi
 
 # Check for environment vars overriding image names
 helm_extra_args=""
 if [ "${NGINX_INGRESS_CONTROLLER_REPO}" ]; then
-	helm_extra_args="${helm_extra_args} --set-string controller.image.repository="${NGINX_INGRESS_CONTROLLER_REPO}""
+	helm_extra_args="${helm_extra_args} --set-string controller.image.repository=${NGINX_INGRESS_CONTROLLER_REPO}"
 fi
 if [ "${NGINX_INGRESS_BACKEND_REPO}" ]; then
-	helm_extra_args="${helm_extra_args} --set-string defaultBackend.image.repository="${NGINX_INGRESS_BACKEND_REPO}""
+	helm_extra_args="${helm_extra_args} --set-string defaultBackend.image.repository=${NGINX_INGRESS_BACKEND_REPO}"
 fi
 
 # Set up the ingress controller

scripts/k8s_deploy_rook.sh

@@ -6,7 +6,7 @@
 # `helm upgrade --namespace rook-ceph rook-ceph rook-release/rook-ceph --version v0.9.0-174.g3b14e51`
 
 HELM_ROOK_CHART_REPO="${HELM_ROOK_CHART_REPO:-https://charts.rook.io/release}"
-HELM_ROOK_CHART_VERSION="${HELM_ROOK_CHART_VERSION:-v1.0.2}"
+HELM_ROOK_CHART_VERSION="${HELM_ROOK_CHART_VERSION:-v1.1.1}"
 
 ./scripts/install_helm.sh
 
@@ -16,20 +16,19 @@ helm repo add rook-release "${HELM_ROOK_CHART_REPO}"
 # Use an alternate image if set
 helm_install_extra_flags=""
 if [ "${ROOK_CEPH_IMAGE_REPO}" ]; then
-	helm_install_extra_flags="--set image.repository="${ROOK_CEPH_IMAGE_REPO}""
+	helm_install_extra_flags="--set image.repository=${ROOK_CEPH_IMAGE_REPO}"
 fi
 
 # Install rook-ceph
-helm status rook-ceph >/dev/null 2>&1
-if [ $? -ne 0 ] ; then
+if ! helm status rook-ceph >/dev/null 2>&1 ; then
     helm install --namespace rook-ceph --name rook-ceph rook-release/rook-ceph --version "${HELM_ROOK_CHART_VERSION}" ${helm_install_extra_flags}
 fi
 
 if kubectl -n rook-ceph get pod -l app=rook-ceph-tools 2>&1 | grep "No resources found." >/dev/null 2>&1; then
     sleep 5
     # If we have an alternate registry defined, dynamically substitute it in
     if [ "${DEEPOPS_ROOK_DOCKER_REGISTRY}" ]; then
-        cat services/rook-cluster.yml | sed "s/image: /image: ${DEEPOPS_ROOK_DOCKER_REGISTRY}\//g" | kubectl create -f -
+        sed "s/image: /image: ${DEEPOPS_ROOK_DOCKER_REGISTRY}\//g" services/rook-cluster.yml | kubectl create -f -
     else
         kubectl create -f services/rook-cluster.yml
     fi

services/rook-cluster.yml

@@ -7,8 +7,7 @@ metadata:
 spec:
   cephVersion:
     # For the latest ceph images, see https://hub.docker.com/r/ceph/ceph/tags
-    # v14 as of 27.06.19 has a bug in the dashboard: https://github.com/rook/rook/issues/3106
-    image: ceph/ceph:v13
+    image: ceph/ceph:v14.2
   dataDirHostPath: /var/lib/rook
   mon:
     count: 3