fix: open api create app use k8s app

goodrain · Aug 11, 2023 · acb1c79 · acb1c79
1 parent 1248a5e
commit acb1c79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/console/services/group_service.py b/console/services/group_service.py
@@ -113,6 +113,7 @@ def create_app(self,
         res["group_id"] = app.ID
         res['app_id'] = app.ID
         res['app_name'] = app.group_name
+        res['k8s_app'] = app.k8s_app
         return res
 
     def create_default_app(self, tenant, region_name):

diff --git a/openapi/views/apps/apps.py b/openapi/views/apps/apps.py
@@ -81,13 +81,14 @@ def post(self, request, *args, **kwargs):
         serializer = AppPostInfoSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         data = serializer.data
+        k8s_app = request.data.get("k8s_app", "")
         group_info = group_service.create_app(
             self.team,
             self.region_name,
             data["app_name"],
             data.get("app_note"),
             self.user.get_username(),
-            k8s_app="app-" + make_uuid()[:6],
+            k8s_app=k8s_app if k8s_app else "app-" + make_uuid()[:6],
         )
         re = AppBaseInfoSerializer(group_info)
         return Response(re.data, status=status.HTTP_201_CREATED)