From eb1d9a6caac4bfe242b78d948fb6aca446ddc095 Mon Sep 17 00:00:00 2001
From: rafzei <13080132+rafzei@users.noreply.github.com>
Date: Thu, 16 Jul 2020 14:07:31 +0200
Subject: [PATCH 1/2] Assert that upgrade from current version is supported
 #1474

---
 .../ansible/playbooks/roles/upgrade/tasks/kubernetes.yml    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml
index 6b01a503df..52e78fa228 100644
--- a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml
+++ b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml
@@ -7,6 +7,12 @@
   import_tasks: kubernetes/get-cluster-version.yml # sets cluster_version
   delegate_to: "{{ groups['kubernetes_master'][0] }}"
 
+- name: Check if upgrade from current version is supported
+  assert:
+    that: cluster_version is version('v1.14.6','>=')
+    fail_msg: Upgrade from versions under v1.14.6 (Epiphany 0.4.4) are not supported. For additional informations refer to the documentation.
+    quiet: true
+
 - name: Include get-kubelet-version.yml
   import_tasks: kubernetes/get-kubelet-version.yml # sets kubelet_version
   delegate_to: "{{ groups['kubernetes_master'][0] }}"

From ac450562251fa62ed7bb764bb73e1a80d8e38de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Zeidler?=
 <13080132+rafzei@users.noreply.github.com>
Date: Wed, 22 Jul 2020 08:13:40 +0200
Subject: [PATCH 2/2] Update
 core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml

Co-authored-by: to-bar <46519524+to-bar@users.noreply.github.com>
---
 .../ansible/playbooks/roles/upgrade/tasks/kubernetes.yml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml
index 52e78fa228..eec3bd482e 100644
--- a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml
+++ b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes.yml
@@ -7,10 +7,10 @@
   import_tasks: kubernetes/get-cluster-version.yml # sets cluster_version
   delegate_to: "{{ groups['kubernetes_master'][0] }}"
 
-- name: Check if upgrade from current version is supported
+- name: Check if upgrade from current K8s version is supported
   assert:
-    that: cluster_version is version('v1.14.6','>=')
-    fail_msg: Upgrade from versions under v1.14.6 (Epiphany 0.4.4) are not supported. For additional informations refer to the documentation.
+    that: cluster_version is version('v1.14.6', '>=')
+    fail_msg: Your Kubernetes version ({{ cluster_version }}) is not supported by this version of Epiphany which requires at least version 1.14.6 (Epiphany v0.4.4). For more information, refer to the documentation.
     quiet: true
 
 - name: Include get-kubelet-version.yml