Skip to content

Commit 31fa30f

Browse files
always use merge-patch+json in apply (#295)
1 parent 2099d2e commit 31fa30f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

openshift/dynamic/apply.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ def apply(resource, definition):
3232
else:
3333
return actual
3434
else:
35-
return resource.patch(body=definition, name=definition['metadata']['name'], namespace=definition['metadata'].get('namespace'))
35+
return resource.patch(
36+
body=definition,
37+
name=definition['metadata']['name'],
38+
namespace=definition['metadata'].get('namespace'),
39+
content_type='application/merge-patch+json')
3640

3741

3842
# The patch is the difference from actual to desired without deletions, plus deletions

0 commit comments

Comments
 (0)