fix(controller): test pass

Author: duanhongyi

rootfs/api/models/app.py

@@ -171,10 +171,10 @@ def _refresh_tls(self, certs_auto_enabled, hosts):
             if data:
                 version = data["metadata"]["resourceVersion"]
                 self._scheduler.certificate.put(
-                    namespace, name, settings.INGRESS_CLASS, hosts, version)
+                    namespace, name, hosts, version)
             else:
                 self._scheduler.certificate.create(
-                    namespace, name, settings.INGRESS_CLASS, hosts)
+                    namespace, name, hosts)
         elif data:
             self._scheduler.certificate.delete(namespace, name)
 

rootfs/api/tests/test_app.py

@@ -78,7 +78,6 @@ def test_app_name_length(self, mock_requests):
         name = 'a' * 64
         body = {'id': name}
         response = self.client.post('/v2/apps', body)
-        print(response)
         self.assertEqual(
             response.data,
             {'id': ['Ensure this field has no more than 63 characters.']}

rootfs/scheduler/mock.py

@@ -119,11 +119,16 @@ def get_type(key):
     return 'unknown'
 
 
+def replace_api_version(old, new='api_v1'):
+    return old.replace('apis_autoscaling_v1', new)\
+        .replace('apis_apps_v1', new)\
+        .replace('apis_networking.k8s.io_v1beta1', new)
+
+
 def get_namespace(url, resource_type):
     """Inspects the URL and gets namespace from it if there is any"""
     # correct back to proper namespace API
-    url = url.replace('apis_autoscaling_v1', 'api_v1')
-    url = url.replace('apis_extensions_v1beta1', 'api_v1')
+    url = replace_api_version(url)
     # check if this is a subresource
     subresource, resource_type, url = is_subresource(resource_type, url)
     # get namespace name
@@ -391,7 +396,8 @@ def upsert_pods(controller, url):
     # turn RC / RS (which a Deployment creates) url into pods one
     url = url.replace(cache_key(controller['metadata']['name']), '')
     if '_replicasets_' in url:
-        url = url.replace('_replicasets_', '_pods').replace('apis_extensions_v1beta1', 'api_v1')  # noqa
+        url = url.replace('_replicasets_', '_pods')
+        url = replace_api_version(url)
     else:
         url = url.replace('_replicationcontrollers_', '_pods')
     # make sure url only has up to "_pods"
@@ -512,7 +518,8 @@ def manage_replicasets(deployment, url):
 
 def update_deployment_status(namespaced_url, url, deployment, rs):
     # Fill out deployment.status for success as pods transition to running state
-    pod_url = namespaced_url.replace('_replicasets', '_pods').replace('apis_extensions_v1beta1', 'api_v1')  # noqa
+    pod_url = namespaced_url.replace('_replicasets', '_pods')
+    pod_url = replace_api_version(pod_url)
     while True:
         # The below needs to be done to emulate Deployment handling things
         # always cleanup pods
@@ -689,7 +696,7 @@ def post(request, context):
     if resource_type not in ['nodes', 'namespaces']:
         namespace = request.url.replace(settings.SCHEDULER_URL,  '')
         namespace = namespace.replace('/api/v1/namespaces/',  '')
-        namespace = re.sub(r'/apis/.{1,}/.{1,}/namespaces/', '', namespace)
+        namespace = re.sub(r'/apis/.+/.+/namespaces/', '', namespace)
         namespace = namespace.split('/')[0]
         data['metadata']['namespace'] = namespace
 

rootfs/scheduler/resources/certificate.py

@@ -7,7 +7,7 @@ class Certificate(Resource):
     api_prefix = 'apis'
 
     @staticmethod
-    def manifest(api_version, namespace, name, ingress_class, hosts, version=None):
+    def manifest(api_version, namespace, name, hosts, version=None):
         data = {
             "apiVersion": api_version,
             "kind": "Certificate",
@@ -44,20 +44,20 @@ def get(self, namespace, name=None, **kwargs):
 
         return response
 
-    def create(self, namespace, name, ingress_class, hosts):
+    def create(self, namespace, name, hosts):
 
         url = self.api('/namespaces/{}/certificates', namespace)
-        data = self.manifest(self.api_version, namespace, name, ingress_class, hosts)
+        data = self.manifest(self.api_version, namespace, name, hosts)
         response = self.http_post(url, json=data)
 
         if not response.status_code == 201:
             raise KubeHTTPException(response, "create certificate {}".format(namespace))
 
         return response
 
-    def put(self, namespace, name, ingress_class, hosts, version):
+    def put(self, namespace, name, hosts, version):
         url = self.api('/namespaces/{}/certificates/{}', namespace, name)
-        data = self.manifest(self.api_version, namespace, name, ingress_class, hosts, version)
+        data = self.manifest(self.api_version, namespace, name, hosts, version)
         response = self.http_put(url, json=data)
 
         if self.unhealthy(response.status_code):

rootfs/scheduler/resources/deployment.py

@@ -1,7 +1,6 @@
 from datetime import datetime, timedelta
 import json
 import time
-from packaging.version import parse
 from scheduler.resources import Resource
 from scheduler.exceptions import KubeException, KubeHTTPException
 
@@ -10,7 +9,6 @@ class Deployment(Resource):
     api_prefix = 'apis'
     api_version = 'apps/v1'
 
-
     def get(self, namespace, name=None, **kwargs):
         """
         Fetch a single Deployment or a list

rootfs/scheduler/resources/horizontalpodautoscaler.py

@@ -10,7 +10,6 @@ class HorizontalPodAutoscaler(Resource):
     api_version = 'autoscaling/v1'
     short_name = 'hpa'
 
-
     def get(self, namespace, name=None, **kwargs):
         """
         Fetch a single HorizontalPodAutoscaler or a list

rootfs/scheduler/resources/ingress.py

@@ -19,7 +19,8 @@ def manifest(self, api_version, ingress, ingress_class, namespace, **kwargs):
                     "kubernetes.io/tls-acme": "true",
                 }
             },
-            "spec": {} }
+            "spec": {}
+        }
         if hosts:
             data["spec"]["rules"] = [{
                 "host": host,
@@ -90,7 +91,7 @@ def manifest(self, api_version, ingress, ingress_class, namespace, **kwargs):
 
 
 class Ingress(Resource):
-  
+
     api_version = 'networking.k8s.io/v1beta1'
     api_prefix = 'apis'
     short_name = 'ingress'