chore(controller): change drycc gateway listener name

Author: duanhongyi

charts/controller/templates/controller-route.yaml

@@ -14,12 +14,12 @@ spec:
   - group: gateway.networking.k8s.io
     kind: Gateway
     name: drycc-gateway
-    sectionName: drycc-gateway-listener-http
+    sectionName: http
 {{- if .Values.global.certManagerEnabled }}
   - group: gateway.networking.k8s.io
     kind: Gateway
     name: drycc-gateway
-    sectionName: drycc-gateway-listener-https
+    sectionName: https
 {{- end }}
   rules:
   - matches:

rootfs/api/models/gateway.py

@@ -34,17 +34,14 @@ def _get_tls_domain(self, auto_tls):
             domains = domains.exclude(certificate=None)
         return domains
 
-    def _get_listener_name(self, port, protocol, suffix=None):
-        names = [self.app.id, str(port)]
+    def _get_listener_name(self, port, protocol, index):
         if protocol in ("TCP", "TLS", "HTTP"):
-            names.append("TCP")
+            protocol = "TCP"
         elif protocol in ("HTTPS", ):
-            names.append("MIX")
+            protocol = "MIX"
         else:
-            names.append("UDP")
-        if suffix:
-            names.append(suffix)
-        return "-".join(names).lower()
+            protocol = "UDP"
+        return "-".join([protocol, str(port), str(index)]).lower()
 
     def add(self, port, protocol):
         # check port
@@ -76,7 +73,7 @@ def listeners(self):
                                    auto_tls else domain.certificate.name)
                     listeners.append({
                         "allowedRoutes": {"namespaces": {"from": "All"}},
-                        "name": self._get_listener_name(port, protocol, domain.domain),
+                        "name": self._get_listener_name(port, protocol, domains.index(domain)),
                         "port": port,
                         "hostname": domain.domain,
                         "protocol": protocol,
@@ -85,7 +82,7 @@ def listeners(self):
             else:
                 listeners.append({
                     "allowedRoutes": {"namespaces": {"from": "All"}},
-                    "name": self._get_listener_name(port, protocol),
+                    "name": self._get_listener_name(port, protocol, 0),
                     "port": port,
                     "protocol": protocol,
                 })

rootfs/api/tests/test_gateway.py

@@ -92,13 +92,13 @@ def test_add_listener(self):
             "name": "bing-gateway",
             "listeners": [
                 {
-                    "name": "%s-8000-tcp" % app_id,
+                    "name": "tcp-8000-%s" % 0,
                     "port": 8000,
                     "protocol": "HTTP",
                     "allowedRoutes": {"namespaces": {"from": "All"}}
                 },
                 {
-                    "name": "%s-443-tcp" % app_id,
+                    "name": "tcp-443-%s" % 0,
                     "port": 443,
                     "protocol": "HTTP",
                     "allowedRoutes": {"namespaces": {"from": "All"}}
@@ -116,9 +116,9 @@ def add_tls_listener(self, name, protocol):
         self.assertEqual(response.status_code, 201)
         response = self.client.get('/v2/apps/{}/gateways/'.format(app_id))
         if protocol == "HTTPS":
-            listener_name = "%s-443-mix-%s" % (app_id, domain)
+            listener_name = "mix-443-%s" % 0
         else:
-            listener_name = "%s-443-tcp-%s" % (app_id, domain)
+            listener_name = "tcp-443-%s" % 0
         results = [{
             "app": app_id,
             "owner": "autotest",