fix(services): default PORT change error

Author: duanhongyi

rootfs/api/models/app.py

@@ -825,6 +825,9 @@ def _create_default_ingress(self, procfile_type, target_port):
             service = Service(owner=self.owner, app=self, procfile_type=procfile_type)
             service.add_port(port, "TCP", target_port)
             service.save()
+        else:
+            if service.update_port(port, "TCP", target_port):
+                service.save()
         # create default gateway
         try:
             gateway = self.gateway_set.filter(name=self.id).latest()

rootfs/api/models/service.py

@@ -43,6 +43,12 @@ def as_dict(self):
     def port_name(self, port, protocol):
         return "-".join([self.app.id, self.procfile_type, protocol, str(port)]).lower()
 
+    def get_port(self, port, protocol):
+        for port in self.ports:
+            if port["port"] == port and port["protocol"] == protocol:
+                return port
+        return None
+
     def add_port(self, port, protocol, target_port):
         self.ports.append({
             "name": self.port_name(port, protocol),
@@ -51,6 +57,25 @@ def add_port(self, port, protocol, target_port):
             "targetPort": target_port,
         })
 
+    def update_port(self, port, protocol, target_port):
+        port = self.get_port(port, "TCP")
+        if not port or port["targetPort"] != target_port:
+            if port and port["targetPort"] != target_port:
+                self.remove_port(port, "TCP")
+            self.add_port(port, "TCP", target_port)
+            return True
+        return False
+
+    def remove_port(self, port, protocol):
+        ports = []
+        for item in self.ports:
+            if item["port"] != port or item["protocol"] != protocol:
+                ports.append(item)
+        if len(self.ports) > len(ports):
+            self.ports = ports
+            return True
+        return False
+
     def refresh_k8s_svc(self):
         if self.canary:
             self._refresh_k8s_svc(self._svc_name(False))

rootfs/api/views.py

@@ -452,14 +452,10 @@ def delete(self, request, **kwargs):
         procfile_type = self.get_serializer().validate_procfile_type(
             request.data.get('procfile_type'))
         service = get_object_or_404(self.get_queryset(**kwargs), procfile_type=procfile_type)
-        ports = []
-        for item in service.ports:
-            if item["port"] != port or item["protocol"] != protocol:
-                ports.append(item)
-        if len(ports) == 0:
+        removed = service.remove_port(port, protocol)
+        if len(service.ports) == 0:
             service.delete()
-        elif len(ports) < len(service.ports):
-            service.ports = ports
+        elif removed:
             service.save()
         return Response(status=status.HTTP_204_NO_CONTENT)