Merge pull request #136 from 2gis/cr-replace

Use replace() API call for Custom Resources
2gis · Mar 1, 2021 · 2df08f4 · 2df08f4
2 parents c5df284 + f314d3f
commit 2df08f4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/k8s_handle/k8s/adapters.py b/k8s_handle/k8s/adapters.py
@@ -294,16 +294,19 @@ def delete(self):
                 '{}'.format(add_indent(e.body)))
             raise ProvisioningError(e)
 
-    def replace(self, _):
+    def replace(self, parameters):
         self._validate()
 
+        if 'resourceVersion' in parameters:
+            self.body['metadata']['resourceVersion'] = parameters['resourceVersion']
+
         try:
             if self.namespace:
-                return self.api.patch_namespaced_custom_object(
+                return self.api.replace_namespaced_custom_object(
                     self.group, self.version, self.namespace, self.plural, self.name, self.body
                 )
 
-            return self.api.patch_cluster_custom_object(
+            return self.api.replace_cluster_custom_object(
                 self.group, self.version, self.plural, self.name, self.body
             )
         except ApiException as e:

diff --git a/k8s_handle/k8s/provisioner.py b/k8s_handle/k8s/provisioner.py
@@ -94,6 +94,13 @@ def _deploy(self, template_body, file_path):
             log.info('{} "{}" already exists, replace it'.format(template_body['kind'], kube_client.name))
             parameters = {}
 
+            if hasattr(resource, 'metadata'):
+                if hasattr(resource.metadata, 'resource_version'):
+                    parameters['resourceVersion'] = resource.metadata.resource_version
+            elif 'metadata' in resource:
+                if 'resourceVersion' in resource['metadata']:
+                    parameters['resourceVersion'] = resource['metadata']['resourceVersion']
+
             if template_body['kind'] == 'Service':
                 if hasattr(resource.spec, 'cluster_ip'):
                     parameters['clusterIP'] = resource.spec.cluster_ip
@@ -108,10 +115,6 @@ def _deploy(self, template_body, file_path):
                     log.warning('PersistentVolume has "{}" status, skip replacing'.format(resource.status.phase))
                     return
 
-            if template_body['kind'] in ['Service', 'CustomResourceDefinition', 'PodDisruptionBudget']:
-                if hasattr(resource.metadata, 'resource_version'):
-                    parameters['resourceVersion'] = resource.metadata.resource_version
-
             kube_client.replace(parameters)
 
         if self.sync_mode: