Bump kubespray and k8s versions
This change also attempts to remove kubeconfig bug workaround which
might have been fixed in upstream kubespray.
Change-Id: I809107030ffe3d963bc278f4220c4b5aabd7b778
diff --git a/engine/installer/kubespray/playbooks/roles/post-deployment/tasks/main.yml b/engine/installer/kubespray/playbooks/roles/post-deployment/tasks/main.yml
index 2f2f54d..101eb36 100644
--- a/engine/installer/kubespray/playbooks/roles/post-deployment/tasks/main.yml
+++ b/engine/installer/kubespray/playbooks/roles/post-deployment/tasks/main.yml
@@ -37,13 +37,6 @@
owner: "{{ ansible_env.SUDO_USER }}"
mode: 0644
-# TODO: get rid of this task once the bug in upstream kubespray is fixed
-- name: WORKAROUND - Remove erroneous line from kubeconfig file
- lineinfile:
- path: "/home/{{ ansible_env.SUDO_USER }}/.kube/config"
- regexp: "^\\[kubeconfig\\] Writing.*"
- state: absent
-
- name: Install rook cluster
include_tasks: "configure-rook-cluster.yml"
vars:
diff --git a/engine/var/versions.yml b/engine/var/versions.yml
index a29bc98..da95eb4 100644
--- a/engine/var/versions.yml
+++ b/engine/var/versions.yml
@@ -36,12 +36,12 @@
# Please note that kubernetes version specified below matches to the supported
# kubernetes version is pinned kubespray. Changing it might break things.
#-------------------------------------------------------------------------------
-# HEAD of kubespray as of 19.04.2019
-kubespray_version: "{{ lookup('env', 'KUBESPRAY_VERSION') | default('05dc2b3a097fda2ffff7a77f4ca843d0e41dec76', true) }}"
+# HEAD of kubespray as of 22.05.2019
+kubespray_version: "{{ lookup('env', 'KUBESPRAY_VERSION') | default('1e470b047354c2767d22ca28c1c1d0fc81f34107', true) }}"
# Kubernetes version to install
# Please note that changing version to anything other than what is pinned below might not work as expected.
# It should always be checked with kubespray to ensure what is pinned here is supported by it.
-kubernetes_version: "{{ lookup('env', 'KUBERNETES_VERSION') | default('v1.14.0', true) }}"
+kubernetes_version: "{{ lookup('env', 'KUBERNETES_VERSION') | default('v1.14.1', true) }}"
#-------------------------------------------------------------------------------
# rook and ceph versions