Merge pull request #3574 from sdodson/35_sdnvalidator

Add oc_objectvalidator to upgrade check

playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml

@@ -82,6 +82,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/upgrades/v3_5/validator.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/upgrades/pre/gate_checks.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml

@@ -90,6 +90,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/upgrades/v3_5/validator.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/upgrades/pre/gate_checks.yml
   tags:
   - pre_upgrade

playbooks/common/openshift-cluster/upgrades/v3_5/validator.yml

@@ -0,0 +1,18 @@
+---
+###############################################################################
+# Pre upgrade checks for known data problems, if this playbook fails you should
+# contact support. If you're not supported contact users@lists.openshift.com
+#
+# oc_objectvalidator provides these two checks
+# 1 - SDN Data issues, never seen in the wild but known possible due to code audits
+#     https://github.com/openshift/origin/issues/12697
+# 2 - Namespace protections, https://bugzilla.redhat.com/show_bug.cgi?id=1428934
+#
+###############################################################################
+- name: Verify 3.5 specific upgrade checks
+  hosts: oo_first_master
+  roles:
+  - { role: lib_openshift }
+  tasks:
+  - name: Check for invalid namespaces and SDN errors
+    oc_objectvalidator:

roles/lib_openshift/library/oc_objectvalidator.py

@@ -1380,7 +1380,16 @@ class OCObjectValidator(OpenShiftCLI):
                 all_invalid[invalid_msg] = invalid
 
         if failed:
-            return {'failed': True, 'msg': 'All objects are not valid.', 'state': 'list', 'results': all_invalid}
+            return {
+                'failed': True,
+                'msg': (
+                    "All objects are not valid.  If you are a supported customer please contact "
+                    "Red Hat Support providing the complete output above. If you are not a customer "
+                    "please contact users@lists.openshift.redhat.com for assistance."
+                    ),
+                'state': 'list',
+                'results': all_invalid
+                }
 
         return {'msg': 'All objects are valid.'}
 

roles/lib_openshift/src/class/oc_objectvalidator.py

@@ -72,6 +72,15 @@ class OCObjectValidator(OpenShiftCLI):
                 all_invalid[invalid_msg] = invalid
 
         if failed:
-            return {'failed': True, 'msg': 'All objects are not valid.', 'state': 'list', 'results': all_invalid}
+            return {
+                'failed': True,
+                'msg': (
+                    "All objects are not valid.  If you are a supported customer please contact "
+                    "Red Hat Support providing the complete output above. If you are not a customer "
+                    "please contact users@lists.openshift.redhat.com for assistance."
+                    ),
+                'state': 'list',
+                'results': all_invalid
+                }
 
         return {'msg': 'All objects are valid.'}

roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py

@@ -891,7 +891,7 @@ class OCObjectValidatorTest(unittest.TestCase):
 
         # Assert
         self.assertTrue(results['failed'])
-        self.assertEqual(results['msg'], 'All objects are not valid.')
+        self.assertIn('All objects are not valid.', results['msg'])
         self.assertEqual(results['state'], 'list')
         self.assertEqual(results['results'], invalid_results)