fix: merge some bugs

console/models/main.py

@@ -107,7 +107,7 @@ class Meta:
     install_number = models.IntegerField(default=0, help_text='安装次数')
     is_official = models.BooleanField(default=False, help_text='是否官方认证')
     details = models.TextField(null=True, blank=True, help_text="应用详情")
-    arch = models.CharField(max_length=32, default="amd64", help_text="架构")
+    arch = models.CharField(max_length=32, help_text="架构")
 
 
 class RainbondCenterAppVersion(BaseModel):

console/services/app_import_and_export_service.py

@@ -437,13 +437,17 @@ def __save_enterprise_import_info(self, import_record, metadata):
         for app_template in metadata:
             annotations = app_template.get("annotations", {})
             app_describe = app_template.pop("describe", "")
+            apps = app_template.get("apps")
             if annotations.get("describe", ""):
                 app_describe = annotations.pop("describe", "")
             app = rainbond_app_repo.get_rainbond_app_by_app_id(import_record.enterprise_id, app_template["group_key"])
+            arch_map = {a.get("arch"): 1 for a in apps}
+            arch = "&".join(list(arch_map.keys()))
             # if app exists, update it
             if app:
                 app.scope = import_record.scope
                 app.describe = app_describe
+                app.arch = app.arch if arch in app.arch.split(",") else app.arch + "," + arch
                 app.save()
                 app_version = rainbond_app_repo.get_rainbond_app_version_by_app_id_and_version(
                     app.app_id, app_template["group_version"])
@@ -460,10 +464,11 @@ def __save_enterprise_import_info(self, import_record, metadata):
                     app_version.template_version = app_template["template_version"]
                     app_version.app_version_info = version_info,
                     app_version.version_alias = version_alias,
+                    app_version.arch = arch
                     app_version.save()
                 else:
                     # create a new version
-                    rainbond_app_versions.append(self.create_app_version(app, import_record, app_template))
+                    rainbond_app_versions.append(self.create_app_version(app, import_record, app_template, arch))
             else:
                 image_base64_string = app_template.pop("image_base64_string", "")
                 if annotations.get("image_base64_string"):
@@ -487,15 +492,15 @@ def __save_enterprise_import_info(self, import_record, metadata):
                     scope=import_record.scope,
                     describe=app_describe,
                     pic=pic_url,
-                )
+                    arch=arch)
                 rainbond_apps.append(rainbond_app)
                 # create a new app version
-                rainbond_app_versions.append(self.create_app_version(rainbond_app, import_record, app_template))
+                rainbond_app_versions.append(self.create_app_version(rainbond_app, import_record, app_template, arch))
         rainbond_app_repo.bulk_create_rainbond_app_versions(rainbond_app_versions)
         rainbond_app_repo.bulk_create_rainbond_apps(rainbond_apps)
 
     @staticmethod
-    def create_app_version(app, import_record, app_template):
+    def create_app_version(app, import_record, app_template, arch):
         version = RainbondCenterAppVersion(
             scope=import_record.scope,
             enterprise_id=import_record.enterprise_id,
@@ -508,6 +513,7 @@ def create_app_version(app, import_record, app_template):
             is_complete=1,
             app_version_info=app_template.get("annotations", {}).get("version_info", ""),
             version_alias=app_template.get("annotations", {}).get("version_alias", ""),
+            arch=arch,
         )
         if app_store.is_no_multiple_region_hub(import_record.enterprise_id):
             version.region_name = import_record.region

console/services/helm_app_yaml.py

@@ -27,9 +27,14 @@ def check_helm_app(self, name, repo_name, chart_name, version, overrides, region
         res, body = region_api.check_helm_app(region, tenant_name, data)
         return res, body["bean"]
 
-    def create_helm_center_app(self, **kwargs):
+    def create_helm_center_app(self, center_app, region_name):
         logger.info("begin create_helm_center_app")
-        return RainbondCenterApp(**kwargs).save()
+        res, body = region_api.get_cluster_nodes_arch(region_name)
+        chaos_arch = list(set(body.get("list")))
+        logger.info("arch{}".format(chaos_arch))
+        arch = chaos_arch[0] if chaos_arch else "amd64"
+        center_app["arch"] = arch
+        return RainbondCenterApp(**center_app).save()
 
     def generate_template(self, cvdata, app_model, version, tenant, chart, region_name, enterprise_id, user_id, overrides,
                           app_id):
@@ -209,7 +214,9 @@ def generate_template(self, cvdata, app_model, version, tenant, chart, region_na
             app_template=template,
             template_version="v2",
             enterprise_id=enterprise_id,
-            upgrade_time=time.time())
+            upgrade_time=time.time(),
+            arch=arch
+        )
         app_version.region_name = region_name
         app_version.save()
 

console/services/share_services.py

@@ -912,10 +912,13 @@ def create_share_info(self, tenant, region_name, share_record, share_team, share
                 app_version.region_name = region_name
             app_version.save()
             if not market_id:
-                arch = list(local_app_version.arch.split(","))
-                if app_version.arch not in arch:
-                    arch.append(app_version.arch)
-                local_app_version.arch = ",".join(arch)
+                if local_app_version.arch:
+                    arch = list(local_app_version.arch.split(","))
+                    if app_version.arch not in arch:
+                        arch.append(app_version.arch)
+                    local_app_version.arch = ",".join(arch)
+                else:
+                    local_app_version.arch = app_version.arch
                 local_app_version.save()
             share_record.step = 2
             share_record.scope = scope

console/views/helm_app.py

@@ -77,7 +77,7 @@ def post(self, request, *args, **kwargs):
                 "enterprise_id": self.enterprise.enterprise_id,
                 "details": details
             }
-            helm_app_service.create_helm_center_app(**center_app)
+            helm_app_service.create_helm_center_app(center_app, self.region_name)
             data["exist"] = False
             data["app_model_id"] = app_id
             result = general_message(200, "success", "创建成功", bean=json.dumps(data))