Merge pull request #106 from jianxiaoguo/main

feat(gateways): add addresses field

Author: duanhongyi

rootfs/api/models/gateway.py

@@ -88,6 +88,14 @@ def listeners(self):
                 })
         return listeners
 
+    @property
+    def addresses(self):
+        data = self._scheduler.gateways.get(self.app.id, self.name, ignore_exception=True)
+        if data.status_code != 200:
+            return []
+        addresses = data.json()["status"].get("addresses", [])
+        return addresses
+
     def refresh_to_k8s(self):
         try:
             try:

rootfs/api/serializers.py

@@ -658,6 +658,12 @@ class GatewaySerializer(serializers.Serializer):
     owner = serializers.ReadOnlyField(source='owner.username')
     name = serializers.CharField(max_length=63, required=True)
     listeners = serializers.JSONField(required=False)
+    addresses = serializers.JSONField(read_only=True)
+
+    def to_representation(self, instance):
+        representation = super().to_representation(instance)
+        representation['addresses'] = instance.addresses
+        return representation
 
     @staticmethod
     def validate_port(value):

rootfs/api/tests/test_gateway.py

@@ -102,7 +102,11 @@ def test_add_listener(self):
                     "port": 443,
                     "protocol": "HTTP",
                     "allowedRoutes": {"namespaces": {"from": "All"}}
-                }]
+                }],
+            "addresses": [{
+                "type": "IPAddress",
+                "value": "172.22.108.207"
+            }]
         }]
         self.assertEqual(results, json.loads(json.dumps(response.data["results"])))
 
@@ -139,6 +143,10 @@ def add_tls_listener(self, name, protocol):
                         "from": "All"
                     }
                 }
+            }],
+            "addresses": [{
+                "type": "IPAddress",
+                "value": "172.22.108.207"
             }]
         }]
         self.assertEqual(results, json.loads(json.dumps(response.data["results"])))

rootfs/scheduler/mock.py

@@ -712,6 +712,13 @@ def post(request, context):
                 ]
             }
         }
+    if resource_type in ["gateways"]:
+        data['status'] = {
+            "addresses": [{
+                "type": "IPAddress",
+                "value": "172.22.108.207"
+            }],
+        }
     # Handle RC / RS / Deployments
     if resource_type in ['replicationcontrollers', 'replicasets', 'deployments']:
         data['status'] = {
@@ -806,7 +813,7 @@ def put(request, context):
     return request.json()
 
 
-def patch(request, context):
+def patch(request, context):  # noqa: C901
     """Process a PATCH request to the kubernetes API"""
     url = cache_key(request.url)
     # type is the second last element
@@ -869,6 +876,9 @@ def patch(request, context):
             upsert_pods(data, url)
         elif resource_type == 'deployments':
             manage_replicasets(data, url)
+    elif resource_type in ['gateways']:
+        data['status'] = item['status']
+        cache.set(url, data, None)
     else:
         # Update the individual resource
         cache.set(url, data, None)