summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-11-25 15:06:40 -0500
committerScott Dodson <sdodson@redhat.com>2015-11-30 15:11:25 -0500
commit018fc6ad154b51f9ff1c7e355072993758125a21 (patch)
treebea3612c82aa060a1e2aa3e02cc9d9a8f108eb1f
parente3071fd15f70214fe9f13b847f2cc5443716d955 (diff)
downloadopenshift-018fc6ad154b51f9ff1c7e355072993758125a21.tar.gz
openshift-018fc6ad154b51f9ff1c7e355072993758125a21.tar.bz2
openshift-018fc6ad154b51f9ff1c7e355072993758125a21.tar.xz
openshift-018fc6ad154b51f9ff1c7e355072993758125a21.zip
Clarify the preflight port check output
-rw-r--r--playbooks/common/openshift-cluster/upgrades/files/pre-upgrade-check17
1 files changed, 10 insertions, 7 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/files/pre-upgrade-check b/playbooks/common/openshift-cluster/upgrades/files/pre-upgrade-check
index b5459f312..e5c958ebb 100644
--- a/playbooks/common/openshift-cluster/upgrades/files/pre-upgrade-check
+++ b/playbooks/common/openshift-cluster/upgrades/files/pre-upgrade-check
@@ -111,13 +111,16 @@ def print_validation_header():
overwhelming the user.
"""
print """\
-At least one port name does not validate. Valid port names:
+At least one port name is invalid and must be corrected before upgrading.
+Please update or remove any resources with invalid port names.
- * must be less that 16 chars
+ Valid port names must:
+
+ * be less that 16 characters
* have at least one letter
- * only a-z0-9-
- * do not start or end with -
- * Dashes may not be next to eachother ('--')
+ * contain only a-z0-9-
+ * not start or end with -
+ * not contain dashes next to each other ('--')
"""
@@ -142,9 +145,9 @@ def main():
# Where the magic happens
first_error = True
for kind, path in [
+ ('deploymentconfigs', ("spec", "template", "spec", "containers")),
('replicationcontrollers', ("spec", "template", "spec", "containers")),
- ('pods', ("spec", "containers")),
- ('deploymentconfigs', ("spec", "template", "spec", "containers"))]:
+ ('pods', ("spec", "containers"))]:
for item in list_items(kind):
namespace = item["metadata"]["namespace"]
item_name = item["metadata"]["name"]