summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-08 11:39:08 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-08 11:39:08 -0500
commitaba941f02348e129a9c8b1928e9dcb2811613609 (patch)
tree24e95ca6603808fa7142f998f5508a9669440db0
parent090ec7a5f19587a35ef3aa73c6063e882de5bdb4 (diff)
parent018fc6ad154b51f9ff1c7e355072993758125a21 (diff)
downloadopenshift-aba941f02348e129a9c8b1928e9dcb2811613609.tar.gz
openshift-aba941f02348e129a9c8b1928e9dcb2811613609.tar.bz2
openshift-aba941f02348e129a9c8b1928e9dcb2811613609.tar.xz
openshift-aba941f02348e129a9c8b1928e9dcb2811613609.zip
Merge pull request #986 from sdodson/preflight
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"]