From 6d1cd07e396f82184940bd98582d86f334e8fca8 Mon Sep 17 00:00:00 2001 From: Bart Wensley Date: Tue, 21 Apr 2020 12:33:55 -0500 Subject: [PATCH] Update scripts that build k8s upgrade patches - part 2 Updating scripts used to build k8s upgrade patches to handle current kubernetes version (1.18.1). My previous commit missed changes to the preapply/preremove scripts. Change-Id: I70b2796f625ac79df1de08e4e802d70e3e33d36a Story: 2006781 Task: 38479 Signed-off-by: Bart Wensley --- patch-scripts/kube-upgrade/KUBE.1.preapply | 4 ++-- patch-scripts/kube-upgrade/KUBE.1.preremove | 4 ++-- patch-scripts/kube-upgrade/KUBE.2.preapply | 4 ++-- patch-scripts/kube-upgrade/KUBE.2.preremove | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patch-scripts/kube-upgrade/KUBE.1.preapply b/patch-scripts/kube-upgrade/KUBE.1.preapply index 1ddc7d3f..4550a7fc 100644 --- a/patch-scripts/kube-upgrade/KUBE.1.preapply +++ b/patch-scripts/kube-upgrade/KUBE.1.preapply @@ -41,8 +41,8 @@ def main(): if len(running_versions) == 0: fatal_error("Could not determine kube-apiserver version") - # Running version must be at least v1.16.1 - test_version = 'v1.16.1' + # Running version must be at least v1.18.1 + test_version = 'v1.18.1' for running_version in running_versions: if LooseVersion(running_version) < LooseVersion(test_version): fatal_error("A kube-apiserver is running %s, but must be" diff --git a/patch-scripts/kube-upgrade/KUBE.1.preremove b/patch-scripts/kube-upgrade/KUBE.1.preremove index a8d39b89..e1dc1719 100644 --- a/patch-scripts/kube-upgrade/KUBE.1.preremove +++ b/patch-scripts/kube-upgrade/KUBE.1.preremove @@ -41,8 +41,8 @@ def main(): if len(running_versions) == 0: fatal_error("Could not determine kube-apiserver version") - # Running version must be no higher than v1.16.1 - test_version = 'v1.16.1' + # Running version must be no higher than v1.18.1 + test_version = 'v1.18.1' for running_version in running_versions: if LooseVersion(running_version) > LooseVersion(test_version): fatal_error("A kube-apiserver is running %s, but must be no higher" diff --git a/patch-scripts/kube-upgrade/KUBE.2.preapply b/patch-scripts/kube-upgrade/KUBE.2.preapply index 41bba893..86d02a09 100644 --- a/patch-scripts/kube-upgrade/KUBE.2.preapply +++ b/patch-scripts/kube-upgrade/KUBE.2.preapply @@ -41,8 +41,8 @@ def main(): if len(running_versions) == 0: fatal_error("Could not determine kube-apiserver version") - # Running version must be at least v1.16.2 - test_version = 'v1.16.2' + # Running version must be at least v1.18.1-upgrade + test_version = 'v1.18.1-upgrade' for running_version in running_versions: if LooseVersion(running_version) < LooseVersion(test_version): fatal_error("A kube-apiserver is running %s, but must be" diff --git a/patch-scripts/kube-upgrade/KUBE.2.preremove b/patch-scripts/kube-upgrade/KUBE.2.preremove index 256b8e91..8b20e195 100644 --- a/patch-scripts/kube-upgrade/KUBE.2.preremove +++ b/patch-scripts/kube-upgrade/KUBE.2.preremove @@ -41,8 +41,8 @@ def main(): if len(running_versions) == 0: fatal_error("Could not determine kube-apiserver version") - # Running version must be no higher than v1.16.2 - test_version = 'v1.16.2' + # Running version must be no higher than v1.18.1-upgrade + test_version = 'v1.18.1-upgrade' for running_version in running_versions: if LooseVersion(running_version) > LooseVersion(test_version): fatal_error("A kube-apiserver is running %s, but must be"