fix(app): can't create app

Author: duanhongyi

charts/controller/templates/controller-ingress.yaml

@@ -10,7 +10,9 @@ metadata:
     heritage: "{{ .Release.Service }}"
   annotations:
     kubernetes.io/tls-acme: "true"
+    {{- if not (eq .Values.global.ingress_class "") }}
     kubernetes.io/ingress.class: "{{ .Values.global.ingress_class }}"
+    {{ end }}
 spec:
   rules:
   - host: drycc.{{ .Values.platform_domain }}

rootfs/api/models/app.py

@@ -219,6 +219,7 @@ def _refresh_ingress_and_tls(self):
         self._refresh_tls(certs_auto_enabled, hosts)
 
     def refresh(self):
+        if not getattr(self, "refresh_enabled", True): return
         self._refresh_ingress_and_tls()
 
     def log(self, message, level=logging.INFO):
@@ -300,6 +301,7 @@ def create(self, *args, **kwargs):  # noqa
                 self._scheduler.ingress.create(
                     ingress, settings.INGRESS_CLASS, namespace,
                     hosts=[host, ])
+                self.refresh_enabled = False  # No refresh ingress
         except KubeException as e:
             raise ServiceUnavailable('Could not create Ingress in Kubernetes') from e
         try:

rootfs/api/models/tls.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.conf import settings
+from django.db import transaction
 
 from api.exceptions import AlreadyExists
 from api.models import UuidAuditedModel
@@ -42,6 +43,7 @@ def _check_previous_tls_settings(self):
         except TLS.DoesNotExist:
             pass
 
+    @transaction.atomic
     def save(self, *args, **kwargs):
         self._check_previous_tls_settings()
         try:

rootfs/scheduler/resources/ingress.py

@@ -43,7 +43,6 @@ def manifest(self, ingress, ingress_class, namespace, **kwargs):
         if tls: data["spec"]["tls"] = tls
         if version: data["metadata"]["resourceVersion"] = version
         return data
-MANIFEAT_CLASSES["default"] = BaseManifest
 
 
 class NginxManifest(BaseManifest):
@@ -89,9 +88,7 @@ class Ingress(Resource):
     short_name = 'ingress'
 
     def manifest(self, ingress, ingress_class, namespace, **kwargs):
-        if ingress_class not in MANIFEAT_CLASSES:
-            ingress_class = "default"
-        return MANIFEAT_CLASSES.get(ingress_class)().manifest(
+        return MANIFEAT_CLASSES.get(ingress_class, BaseManifest)().manifest(
             ingress, ingress_class, namespace, **kwargs
         )