feat(controller): remove deprecated api

Author: duanhongyi

charts/controller/templates/controller-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: drycc-controller

charts/controller/templates/controller-ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   namespace: "{{ .Release.Namespace }}"

rootfs/api/models/app.py

@@ -1023,7 +1023,7 @@ def autoscale(self, proc_type, autoscale):
         name = '{}-{}'.format(self.id, proc_type)
         # basically fake out a Deployment object (only thing we use) to assign to the HPA
         target = {
-            'apiVersion': 'extensions/v1beta1',
+            'apiVersion': 'apps/v1',
             'kind': 'Deployment',
             'metadata': {'name': name}}
 

rootfs/scheduler/mock.py

@@ -687,8 +687,9 @@ def post(request, context):
 
     # don't bother adding it to those two resources since they live outside namespace
     if resource_type not in ['nodes', 'namespaces']:
-        namespace = request.url.replace(settings.SCHEDULER_URL + '/api/v1/namespaces/',  '')
-        namespace = namespace.replace(settings.SCHEDULER_URL + '/apis/extensions/v1beta1/namespaces/',  '')  # noqa
+        namespace = request.url.replace(settings.SCHEDULER_URL,  '')
+        namespace = namespace.replace('/api/v1/namespaces/',  '')
+        namespace = re.sub(r'/apis/.{1,}/.{1,}/namespaces/', '', namespace)
         namespace = namespace.split('/')[0]
         data['metadata']['namespace'] = namespace
 

rootfs/scheduler/resources/deployment.py

@@ -8,12 +8,8 @@
 
 class Deployment(Resource):
     api_prefix = 'apis'
+    api_version = 'apps/v1'
 
-    @property
-    def api_version(self):
-        if self.version() >= parse("1.9.0"):
-            return 'extensions/v1beta1'
-        return 'extensions/v1beta1'
 
     def get(self, namespace, name=None, **kwargs):
         """

rootfs/scheduler/resources/horizontalpodautoscaler.py

@@ -7,17 +7,9 @@
 
 class HorizontalPodAutoscaler(Resource):
     api_prefix = 'apis'
+    api_version = 'autoscaling/v1'
     short_name = 'hpa'
 
-    @property
-    def api_version(self):
-        # API location changes between versions
-        # http://kubernetes.io/docs/user-guide/horizontal-pod-autoscaling/#api-object
-        if self.version() >= parse("1.3.0"):
-            return 'autoscaling/v1'
-
-        # 1.2 and older
-        return 'extensions/v1beta1'
 
     def get(self, namespace, name=None, **kwargs):
         """

rootfs/scheduler/resources/ingress.py

@@ -6,21 +6,20 @@
 
 class BaseManifest(object):
 
-    def manifest(self, ingress, ingress_class, namespace, **kwargs):
+    def manifest(self, api_version, ingress, ingress_class, namespace, **kwargs):
         path = "/*" if ingress_class in ("gce", "alb") else "/"
         hosts, tls = kwargs.pop("hosts", None), kwargs.pop("tls", None)
         version = kwargs.pop("version", None)
         data = {
             "kind": "Ingress",
-            "apiVersion": "extensions/v1beta1",
+            "apiVersion": api_version,
             "metadata": {
                 "name": ingress,
                 "annotations": {
                     "kubernetes.io/tls-acme": "true",
                 }
             },
-            "spec": {}
-        }
+            "spec": {} }
         if hosts:
             data["spec"]["rules"] = [{
                 "host": host,
@@ -49,9 +48,9 @@ def manifest(self, ingress, ingress_class, namespace, **kwargs):
 
 class NginxManifest(BaseManifest):
 
-    def manifest(self, ingress, ingress_class, namespace, **kwargs):
+    def manifest(self, api_version, ingress, ingress_class, namespace, **kwargs):
         data = BaseManifest.manifest(
-            self, ingress, ingress_class, namespace, **kwargs)
+            self, api_version, ingress, ingress_class, namespace, **kwargs)
         if "whitelist" in kwargs:
             whitelist = ", ".join(kwargs.pop("whitelist"))
             data["metadata"]["annotations"].update({
@@ -70,9 +69,9 @@ def manifest(self, ingress, ingress_class, namespace, **kwargs):
 
 class TraefikManifest(BaseManifest):
 
-    def manifest(self, ingress, ingress_class, namespace, **kwargs):
+    def manifest(self, api_version, ingress, ingress_class, namespace, **kwargs):
         data = BaseManifest.manifest(
-            self, ingress, ingress_class, namespace, **kwargs)
+            self, api_version, ingress, ingress_class, namespace, **kwargs)
         if "whitelist" in kwargs:
             whitelist = ", ".join(kwargs.pop("whitelist"))
             data["metadata"]["annotations"].update({
@@ -91,22 +90,25 @@ def manifest(self, ingress, ingress_class, namespace, **kwargs):
 
 
 class Ingress(Resource):
+  
+    api_version = 'networking.k8s.io/v1beta1'
+    api_prefix = 'apis'
     short_name = 'ingress'
 
-    def manifest(self, ingress, ingress_class, namespace, **kwargs):
+    def manifest(self, api_version, ingress, ingress_class, namespace, **kwargs):
         return MANIFEAT_CLASSES.get(ingress_class, BaseManifest)().manifest(
-            ingress, ingress_class, namespace, **kwargs
+            api_version, ingress, ingress_class, namespace, **kwargs
         )
 
-    def get(self, namespace, name=None, **kwargs):
+    def get(self, namespace, ingress=None, **kwargs):
         """
         Fetch a single Ingress or a list of Ingresses
         """
-        if name is not None:
-            url = "/apis/extensions/v1beta1/namespaces/%s/ingresses/%s" % (namespace, name)
-            message = 'get Ingress ' + name
+        if ingress is not None:
+            url = self.api("/namespaces/{}/ingresses/{}", namespace, ingress)
+            message = 'get Ingress ' + ingress
         else:
-            url = "/apis/extensions/v1beta1/namespaces/%s/ingresses" % namespace
+            url = self.api("/namespaces/{}/ingresses", namespace)
             message = 'get Ingresses'
 
         response = self.http_get(url, params=self.query_params(**kwargs))
@@ -116,8 +118,8 @@ def get(self, namespace, name=None, **kwargs):
         return response
 
     def create(self, ingress, ingress_class, namespace, **kwargs):
-        url = "/apis/extensions/v1beta1/namespaces/%s/ingresses" % namespace
-        data = self.manifest(ingress, ingress_class, namespace, **kwargs)
+        url = self.api("/namespaces/{}/ingresses", namespace)
+        data = self.manifest(self.api_version, ingress, ingress_class, namespace, **kwargs)
         response = self.http_post(url, json=data)
 
         if not response.status_code == 201:
@@ -126,9 +128,9 @@ def create(self, ingress, ingress_class, namespace, **kwargs):
         return response
 
     def put(self, ingress, ingress_class, namespace, version, **kwargs):
-        url = "/apis/extensions/v1beta1/namespaces/%s/ingresses/%s" % (namespace, ingress)
+        url = self.api("/namespaces/{}/ingresses/{}", namespace, ingress)
         kwargs["version"] = version
-        data = self.manifest(ingress, ingress_class, namespace, **kwargs)
+        data = self.manifest(self.api_version, ingress, ingress_class, namespace, **kwargs)
         response = self.http_put(url, json=data)
 
         if self.unhealthy(response.status_code):
@@ -137,7 +139,7 @@ def put(self, ingress, ingress_class, namespace, version, **kwargs):
         return response
 
     def delete(self, namespace, ingress):
-        url = "/apis/extensions/v1beta1/namespaces/%s/ingresses/%s" % (namespace, ingress)
+        url = self.api("/namespaces/{}/ingresses/{}", namespace, ingress)
         response = self.http_delete(url)
         if self.unhealthy(response.status_code):
             raise KubeHTTPException(response, 'delete Ingress "{}"', namespace)

rootfs/scheduler/resources/replicaset.py

@@ -4,7 +4,7 @@
 
 class ReplicaSet(Resource):
     api_prefix = 'apis'
-    api_version = 'extensions/v1beta1'
+    api_version = 'apps/v1'
     short_name = 'rs'
 
     def get(self, namespace, name=None, **kwargs):

rootfs/scheduler/tests/test_deployments.py

@@ -96,7 +96,7 @@ def test_deployment_api_version_1_9_and_up(self):
 
         deployment = copy.copy(self.scheduler.deployment)
 
-        expected = 'extensions/v1beta1'
+        expected = 'apps/v1'
 
         for canonical in cases:
             deployment.version = mock.MagicMock(return_value=parse(canonical))
@@ -114,7 +114,7 @@ def test_deployment_api_version_1_8_and_lower(self):
 
         deployment = copy.copy(self.scheduler.deployment)
 
-        expected = 'extensions/v1beta1'
+        expected = 'apps/v1'
 
         for canonical in cases:
             deployment.version = mock.MagicMock(return_value=parse(canonical))
@@ -210,7 +210,7 @@ def test_get_deployment(self):
         response = self.scheduler.deployment.get(self.namespace, name)
         data = response.json()
         self.assertEqual(response.status_code, 200, data)
-        self.assertEqual(data['apiVersion'], 'extensions/v1beta1')
+        self.assertEqual(data['apiVersion'], 'apps/v1')
         self.assertEqual(data['kind'], 'Deployment')
         self.assertEqual(data['metadata']['name'], name)
         self.assertDictContainsSubset(
@@ -285,7 +285,7 @@ def test_get_deployment_replicaset(self):
         data = response.json()
 
         self.assertEqual(response.status_code, 200, data)
-        self.assertEqual(data['apiVersion'], 'extensions/v1beta1', data)
+        self.assertEqual(data['apiVersion'], 'apps/v1', data)
         self.assertEqual(data['kind'], 'ReplicaSet', data)
         self.assertEqual(data['metadata']['name'], replica_name, data)
         self.assertDictContainsSubset(

rootfs/scheduler/tests/test_horizontalpodautoscaler_12_lower.py

@@ -212,7 +212,7 @@ def test_get_horizontalpodautoscaler(self):
         response = self.scheduler.hpa.get(self.namespace, name)
         data = response.json()
         self.assertEqual(response.status_code, 200, data)
-        self.assertEqual(data['apiVersion'], 'extensions/v1beta1')
+        self.assertEqual(data['apiVersion'], 'autoscaling/v1')
         self.assertEqual(data['kind'], 'HorizontalPodAutoscaler')
         self.assertEqual(data['metadata']['name'], name)
         self.assertDictContainsSubset(