fix(controller): manifest error

Author: duanhongyi

.woodpecker/manifest.yml

@@ -23,6 +23,7 @@ pipeline:
     -e PLUGIN_SPEC=.woodpecker/manifest.tmpl
     -e PLUGIN_USERNAME=$CONTAINER_USERNAME
     -e PLUGIN_PASSWORD=$CONTAINER_PASSWORD
+    -e DRONE_TAG=$CI_COMMIT_TAG
     -v $(pwd):$(pwd)
     -w $(pwd)
     plugins/manifest

charts/controller/templates/controller-certificate.yaml

@@ -4,7 +4,7 @@ kind: Certificate
 metadata:
   name: drycc-controller
 spec:
-  secretName: drycc-controller-certificate-auto
+  secretName: drycc-controller-auto-tls
   issuerRef:
     name: drycc-cluster-issuer
     kind: ClusterIssuer

charts/controller/templates/controller-ingress.yaml

@@ -30,7 +30,7 @@ spec:
               number: 80
   {{- if .Values.global.certManagerEnabled }}
   tls:
-    - secretName: drycc-controller-certificate-auto
+    - secretName: drycc-controller-auto-tls
       hosts:
         - drycc.{{ .Values.global.platformDomain }}
   {{- end }}

rootfs/api/migrations/0001_initial.py

@@ -204,8 +204,6 @@ class Migration(migrations.Migration):
                 ('updated', models.DateTimeField(auto_now=True)),
                 ('port', models.PositiveIntegerField(default=5000)),
                 ('protocol', models.TextField(default='TCP')),
-                ('target_port', models.PositiveIntegerField(default=5000)),
-                ('service_type', models.TextField()),
                 ('procfile_type', models.TextField()),
                 ('app', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.app')),
                 ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
@@ -282,7 +280,6 @@ class Migration(migrations.Migration):
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('updated', models.DateTimeField(auto_now=True)),
                 ('routable', models.BooleanField(null=True)),
-                ('allowlist', models.JSONField(default=None, null=True)),
                 ('autoscale', models.JSONField(blank=True, default=dict)),
                 ('label', models.JSONField(blank=True, default=dict)),
                 ('app', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.app')),

rootfs/api/models/app.py

@@ -18,10 +18,7 @@ class AppSettings(UuidAuditedModel):
 
     owner = models.ForeignKey(User, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
-    routable = models.BooleanField(null=True)
-    # the default values is None to differentiate from user sending an empty allowlist
-    # and user just updating other fields meaning the values needs to be copied from prev release
-    allowlist = models.JSONField(default=None, null=True)
+    routable = models.BooleanField(default=True)
     autoscale = models.JSONField(default=dict, blank=True)
     label = models.JSONField(default=dict, blank=True)
 
@@ -37,15 +34,11 @@ def __init__(self, *args, **kwargs):
     def __str__(self):
         return "{}-{}".format(self.app.id, str(self.uuid)[:7])
 
-    def new(self, user, allowlist):
+    def new(self, user):
         """
-        Create a new application appSettings using the provided allowlist
-        on behalf of a user.
+        Create a new application appSettings on behalf of a user.
         """
-
-        app_settings = AppSettings.objects.create(
-            owner=user, app=self.app, allowlist=allowlist)
-
+        app_settings = AppSettings.objects.create(owner=user, app=self.app)
         return app_settings
 
     def _update_routable(self, previous_settings):
@@ -54,35 +47,12 @@ def _update_routable(self, previous_settings):
         # If no previous settings then assume it is the first record and default to true
         if previous_settings is None:
             setattr(self, 'routable', True)
-            self.app.routable(True)
         # if nothing changed copy the settings from previous
         elif new is None and old is not None:
             setattr(self, 'routable', old)
         elif old != new:
-            self.app.routable(new)
             self.summary += ["{} changed routablity from {} to {}".format(self.owner, old, new)]
 
-    def _update_allowlist(self, previous_settings):
-        # If no previous settings then assume it is the first record and set as empty
-        # to prevent from database constraint violation
-        if not previous_settings:
-            setattr(self, 'allowlist', [])
-        old = getattr(previous_settings, 'allowlist', [])
-        new = getattr(self, 'allowlist', None)
-        # if nothing changed copy the settings from previous
-        if new is None and old is not None:
-            setattr(self, 'allowlist', old)
-        elif set(old) != set(new):
-            added = ', '.join(k for k in set(new)-set(old))
-            added = 'added ' + added if added else ''
-            deleted = ', '.join(k for k in set(old)-set(new))
-            deleted = 'deleted ' + deleted if deleted else ''
-            changes = ', '.join(i for i in (added, deleted) if i)
-            if changes:
-                if self.summary:
-                    self.summary += ' and '
-                self.summary += "{} {}".format(self.owner, changes)
-
     def _update_autoscale(self, previous_settings):
         data = getattr(previous_settings, 'autoscale', {}).copy()
         new = getattr(self, 'autoscale', {}).copy()
@@ -165,7 +135,6 @@ def save(self, *args, **kwargs):
 
         try:
             self._update_routable(previous_settings)
-            self._update_allowlist(previous_settings)
             self._update_autoscale(previous_settings)
             self._update_label(previous_settings)
         except (UnprocessableEntity, NotFound):
@@ -180,4 +149,3 @@ def save(self, *args, **kwargs):
         summary = ' '.join(self.summary)
         self.app.log('summary of app setting changes: {}'.format(summary), logging.DEBUG)
         super(AppSettings, self).save(**kwargs)
-        self.app.refresh()

rootfs/api/models/appsettings.py

@@ -1,13 +1,9 @@
 import uuid
-import morph
 import importlib
 from django.db import models
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser
 from django.utils.translation import gettext_lazy as _
-from scheduler.exceptions import KubeException
-from api.exceptions import ServiceUnavailable
-from api.utils import dict_merge
 
 
 def get_anonymous_user_instance(user): return user(id=-1, username=settings.ANONYMOUS_USER_NAME)
@@ -29,58 +25,6 @@ def _scheduler(cls):
         mod = importlib.import_module(settings.SCHEDULER_MODULE)
         return mod.SchedulerClient(settings.SCHEDULER_URL, settings.K8S_API_VERIFY_TLS)
 
-    def _fetch_service_config(self, app, svc_name=None):
-        try:
-            # Get the service from k8s to attach the domain correctly
-            if svc_name is None:
-                svc_name = app
-            svc = self._scheduler.svc.get(app, svc_name).json()
-        except KubeException as e:
-            raise ServiceUnavailable('Could not fetch Kubernetes Service {}'.format(app)) from e
-
-        # Get minimum structure going if it is missing on the service
-        if 'metadata' not in svc or 'annotations' not in svc['metadata']:
-            default = {'metadata': {'annotations': {}}}
-            svc = dict_merge(svc, default)
-
-        if 'labels' not in svc['metadata']:
-            default = {'metadata': {'labels': {}}}
-            svc = dict_merge(svc, default)
-
-        return svc
-
-    def _load_service_config(self, app, component, svc_name=None):
-        # fetch setvice definition with minimum structure
-        svc = self._fetch_service_config(app, svc_name)
-
-        # always assume a .drycc.cc/ ending
-        component = "%s.drycc.cc/" % component
-
-        # Filter to only include values for the component and strip component out of it
-        # Processes dots into a nested structure
-        config = morph.unflatten(morph.pick(svc['metadata']['annotations'], prefix=component))
-
-        return config
-
-    def _save_service_config(self, app, component, data, svc_name=None):
-        if svc_name is None:
-            svc_name = app
-        # fetch setvice definition with minimum structure
-        svc = self._fetch_service_config(app, svc_name)
-
-        # always assume a .drycc.cc ending
-        component = "%s.drycc.cc/" % component
-
-        # add component to data and flatten
-        data = {"%s%s" % (component, key): value for key, value in list(data.items()) if value}
-        svc['metadata']['annotations'].update(morph.flatten(data))
-
-        # Update the k8s service for the application with new service information
-        try:
-            self._scheduler.svc.update(app, svc_name, svc)
-        except KubeException as e:
-            raise ServiceUnavailable('Could not update Kubernetes Service {}'.format(app)) from e
-
 
 class UuidAuditedModel(AuditedModel):
     """Add a UUID primary key to an :class:`AuditedModel`."""

rootfs/api/models/base.py

@@ -28,15 +28,13 @@ class Meta:
     @transaction.atomic
     def save(self, *args, **kwargs):
         super(Domain, self).save(*args, **kwargs)
-        self.app.refresh()
 
     @transaction.atomic
     def delete(self, *args, **kwargs):
         # Deatch cert, updates k8s
         if self.certificate:
             self.certificate.detach(domain=str(self.domain))
         super(Domain, self).delete(*args, **kwargs)
-        self.app.refresh()
 
     def __str__(self):
         return self.domain