Merge pull request #9280 from tremble/oc_env_emptystring

Cope with OpenShift returning no value when an environment variable is an empty string

roles/lib_openshift/library/oc_adm_registry.py

@@ -1669,8 +1669,12 @@ spec:
             return False
 
         for result in results:
-            if result['name'] == key and result['value'] == value:
-                return True
+            if result['name'] == key:
+                if 'value' not in result:
+                    if value == "" or value is None:
+                        return True
+                elif result['value'] == value:
+                    return True
 
         return False
 

roles/lib_openshift/library/oc_adm_router.py

@@ -1878,8 +1878,12 @@ spec:
             return False
 
         for result in results:
-            if result['name'] == key and result['value'] == value:
-                return True
+            if result['name'] == key:
+                if 'value' not in result:
+                    if value == "" or value is None:
+                        return True
+                elif result['value'] == value:
+                    return True
 
         return False
 

roles/lib_openshift/library/oc_env.py

@@ -1560,8 +1560,12 @@ spec:
             return False
 
         for result in results:
-            if result['name'] == key and result['value'] == value:
-                return True
+            if result['name'] == key:
+                if 'value' not in result:
+                    if value == "" or value is None:
+                        return True
+                elif result['value'] == value:
+                    return True
 
         return False
 

roles/lib_openshift/library/oc_scale.py

@@ -1547,8 +1547,12 @@ spec:
             return False
 
         for result in results:
-            if result['name'] == key and result['value'] == value:
-                return True
+            if result['name'] == key:
+                if 'value' not in result:
+                    if value == "" or value is None:
+                        return True
+                elif result['value'] == value:
+                    return True
 
         return False
 

roles/lib_openshift/library/oc_volume.py

@@ -1594,8 +1594,12 @@ spec:
             return False
 
         for result in results:
-            if result['name'] == key and result['value'] == value:
-                return True
+            if result['name'] == key:
+                if 'value' not in result:
+                    if value == "" or value is None:
+                        return True
+                elif result['value'] == value:
+                    return True
 
         return False
 

roles/lib_openshift/src/lib/deploymentconfig.py

@@ -88,8 +88,12 @@ spec:
             return False
 
         for result in results:
-            if result['name'] == key and result['value'] == value:
-                return True
+            if result['name'] == key:
+                if 'value' not in result:
+                    if value == "" or value is None:
+                        return True
+                elif result['value'] == value:
+                    return True
 
         return False