chore(controller): add deploy default annotations (#113)

Author: jianxiaoguo

rootfs/api/models/resource.py

@@ -223,10 +223,7 @@ def retrieve(self, *args, **kwargs):
                 logger.info("retrieve binding info error: {}".format(e))
         if update_flag is True:
             self.save()
-        if self.status == "Ready" and self.binding == "Ready":
-            return True
-        else:
-            return False
+        return self.status == "Ready"
 
     def detach_resource(self, *args, **kwargs):
         if self.binding != "Ready":

rootfs/scheduler/resources/deployment.py

@@ -34,6 +34,7 @@ def manifest(self, namespace, name, image, entrypoint, command, spec_annotations
         replicas = kwargs.get('replicas', 0)
         batches = kwargs.get('deploy_batches', None)
         tags = kwargs.get('tags', {})
+        annotations = kwargs.get('annotations', {})
 
         labels = {
             'app': namespace,
@@ -106,6 +107,8 @@ def manifest(self, namespace, name, image, entrypoint, command, spec_annotations
 
         # set the old deployment spec annotations on this deployment
         manifest['spec']['template']['metadata']['annotations'] = spec_annotations
+        if annotations:
+            manifest['spec']['template']['metadata']['annotations'].update(annotations)
         if "resource_version" in kwargs:
             manifest["metadata"]["resourceVersion"] = kwargs.get("resource_version")