Add apply method to dynamic client (#291)

Author: openshift-cherrypick-robot

openshift/dynamic/apply.py

@@ -55,7 +55,7 @@ def dict_merge(a, b):
     result = deepcopy(a)
     for k, v in b.items():
         if k in result and isinstance(result[k], dict):
-                result[k] = dict_merge(result[k], v)
+            result[k] = dict_merge(result[k], v)
         else:
             result[k] = deepcopy(v)
     return result

openshift/dynamic/client.py

@@ -16,6 +16,7 @@
 
 from openshift import __version__
 from openshift.dynamic.exceptions import ResourceNotFoundError, ResourceNotUniqueError, api_exception, KubernetesValidateMissing
+from openshift.dynamic.apply import apply
 from urllib3.exceptions import ProtocolError, MaxRetryError
 
 try:
@@ -176,6 +177,16 @@ def patch(self, resource, body=None, name=None, namespace=None, **kwargs):
 
         return self.request('patch', path, body=body, content_type=content_type, **kwargs)
 
+    @meta_request
+    def apply(self, resource, body=None, name=None, namespace=None):
+        body = self.serialize_body(body)
+        name = name or body.get('metadata', {}).get('name')
+        if not name:
+            raise ValueError("name is required to apply {}.{}".format(resource.group_version, resource.kind))
+        if resource.namespaced:
+            namespace = self.ensure_namespace(resource, namespace, body)
+        return apply(resource, body)
+
     def watch(self, resource, namespace=None, name=None, label_selector=None, field_selector=None, resource_version=None, timeout=None):
         """
         Stream events for a resource from the Kubernetes API
@@ -498,6 +509,9 @@ def replace(self, *args, **kwargs):
     def patch(self, *args, **kwargs):
         return self.verb_mapper('patch', *args, **kwargs)
 
+    def apply(self, *args, **kwargs):
+        return self.verb_mapper('apply', *args, **kwargs)
+
     def to_dict(self):
         return {
             '_type': 'ResourceList',