Merge pull request #117 from bradmwilliams/api-group-versions-fix

Adding support for V4 style APIGroups

Author: bradmwilliams

ansible/rebuild_module.digest

@@ -1 +1 @@
-c63964b8473c9baa3b224e2de1b50b28  -
+151eb1208a9e21d260757c0218150029  -

ansible/roles/openshift_client_python/library/openshift_client_python.py

@@ -1610,3 +1610,37 @@ def node_ssh_client_exec(apiobj_node_name_or_qname=None,
         return_code = ssh_stdout.channel.recv_exit_status()
 
         return return_code, stdout, stderr
+
+
+"""
+There is a small number of APIs that appear in an API Group that is specified as only
+an unclassified version, like "v1".  This is something specific to OpenShift V4, but 
+to be consistent, Im adding logic that handles this across versions.
+"""
+SUPPORTED_SINGULAR_API_GROUP_SUFFIXES = ["v1"]
+
+
+def _is_singular_api_group(group):
+    for suffix in SUPPORTED_SINGULAR_API_GROUP_SUFFIXES:
+        if group.endswith('.{}'.format(suffix)):
+            return True
+    return False
+
+
+def get_gettable_kinds():
+    """
+    Returns a list of the 'gettable' (i.e. oc get <kind> will work) kinds known to openshift-client-python.
+    You can run `oc.update_api_resources` first if this needs to be exact for a cluster.
+    :return: list<string> where each entry is a valid kind
+    """
+    kinds = []
+    for kind in naming.get_api_resources_kinds():
+        if '/' in kind:
+            kinds.append(kind.split('/')[0])
+        else:
+            if _is_singular_api_group(kind):
+                kinds.append(kind.split('.')[0])
+            else:
+                kinds.append(kind)
+
+    return kinds

packages/openshift/base_verbs.py

@@ -37,8 +37,6 @@ def _process_api_value(value, handle_apiversion):
                 if '/' in value:
                     group = value.split('/')[0]
                     return group
-                else:
-                    return None
             return value
         return None
 
@@ -67,7 +65,9 @@ def get_api_resources_kinds():
     ungettable = set()
     ungettable.update("""
 rangeallocations.security.openshift.io
+rangeallocations.security.openshift.io/v1
 useridentitymappings.user.openshift.io
+useridentitymappings.user.openshift.io/v1
 """.strip().split())
 
     return kinds.difference(ungettable)