Skip to content

Add apply method to dynamic client #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabianvf merged 1 commit into from
May 15, 2019
Merged

Add apply method to dynamic client #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openshift/dynamic/apply.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions openshift/dynamic/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down