chore(controller): update release state when force deploy (#194)

* chore(controller): update release state when force deploy

* chore(controller): frequent cert detach may lead to gateway patch 409 sometime

* chore(controller): config detach unexpected ptype

Author: jianxiaoguo

rootfs/api/models/app.py

@@ -312,7 +312,7 @@ def pipeline(self, release, ptypes, force_deploy=False):
                 if not rollback_on_failure:
                     self.log(f"{prefix} deploy do not rollback on failure")
                 self.deploy(release, ptypes, force_deploy, rollback_on_failure)
-            if release.state == "created":
+            if release.state in ["created", "crashed"]:
                 release.state = "succeed"
             ptypes = list(ptypes) if ptypes is not None else ptypes
             release.add_condition(state="succeed", action="pipeline", ptypes=ptypes)

rootfs/api/models/gateway.py

@@ -105,13 +105,17 @@ def refresh_to_k8s(self):
                 data = self.scheduler.gateways.get(self.app.id, self.name).json()
                 if len(kwargs["listeners"]) > 0:
                     kwargs["version"] = data["metadata"]["resourceVersion"]
-                    self.scheduler.gateways.patch(self.app.id, self.name, **kwargs)
+                    response = self.scheduler.gateways.patch(self.app.id, self.name, **kwargs)
+                    if response.status_code == 409:
+                        raise ServiceUnavailable(f'Kubernetes gateway could not be patched: {response.status_code} {response.reason}, please retry')  # noqa 
                 else:
                     logger.debug("delete k8s resource when listeners are empty")
                     self.scheduler.gateways.delete(
                         self.app.id, self.name, ignore_exception=True)
             except KubeException:
                 if len(kwargs["listeners"]) > 0:
+                    if "version" in kwargs:
+                        kwargs.pop("version")
                     self.scheduler.gateways.create(self.app.id, self.name, **kwargs)
                 else:
                     logger.debug("skip creating k8s resource when listeners are empty")

rootfs/api/views.py

@@ -445,9 +445,10 @@ def delete(self, request, **kwargs):
 
         config = self.model(app=self.get_app(), owner=self.request.user, values_refs={})
         old_values_refs = config.previous().values_refs.copy()
-        for ptype, groups in values_refs.items():
-            for group in old_values_refs.get(ptype, []):
-                if group not in groups:
+        for ptype, old_groups in old_values_refs.items():
+            groups_to_delete = values_refs.get(ptype, [])
+            for group in old_groups:
+                if group not in groups_to_delete:
                     if ptype not in config.values_refs:
                         config.values_refs[ptype] = [group]
                     elif group not in config.values_refs[ptype]:

rootfs/scheduler/resources/deployment.py

@@ -284,7 +284,7 @@ def in_progress(self, namespace, name, timeout, batches, replicas, tags):
                 namespace,
                 'Deployment {} had stalled due an error and will be rolled back. {}'.format(
                     name, str(e)),
-                level='DEBUG'
+                level=logging.DEBUG
             )
             return False, True
 
@@ -305,7 +305,7 @@ def in_progress(self, namespace, name, timeout, batches, replicas, tags):
                 namespace,
                 'Deploy operation for Deployment {} in has expired. '
                 'Rolling back to last good known release'.format(name),
-                level='DEBUG',
+                level=logging.DEBUG,
             )
             return False, True
 

rootfs/scheduler/resources/gateway.py

@@ -59,8 +59,10 @@ def patch(self, namespace, name, ignore_exception=False, **kwargs):
             json=data,
             headers={"Content-Type": "application/merge-patch+json"}
         )
+        if response.status_code == 409:
+            return response
         if not ignore_exception and self.unhealthy(response.status_code):
-            raise KubeHTTPException(response, "put gateway {}".format(namespace))
+            raise KubeHTTPException(response, "patch gateway {}".format(namespace))
         return response
 
     def delete(self, namespace, name, ignore_exception=True):
@@ -128,7 +130,7 @@ def patch(self, namespace, name, ignore_exception=False, **kwargs):
             headers={"Content-Type": "application/merge-patch+json"}
         )
         if not ignore_exception and self.unhealthy(response.status_code):
-            raise KubeHTTPException(response, "put {} {}".format(self.kind.lower(), namespace))
+            raise KubeHTTPException(response, "patch {} {}".format(self.kind.lower(), namespace))
         return response
 
     def delete(self, namespace, name, ignore_exception=True):