Merge pull request #110 from Cryptophobia/feature/fix-deprecated-apis…

…-1.16

Feature/fix deprecated apis 1.16

README.md

@@ -1,6 +1,7 @@
 
 # Deis Controller
 
+[![Build Status](https://travis-ci.org/teamhephy/controller.svg?branch=master)](https://travis-ci.org/teamhephy/controller)
 [![codecov.io](https://codecov.io/github/deis/controller/coverage.svg?branch=master)](https://codecov.io/github/deis/controller?branch=master)
 [![Docker Repository on Quay](https://quay.io/repository/deisci/controller/status "Docker Repository on Quay")](https://quay.io/repository/deisci/controller)
 

charts/controller/Chart.yaml

@@ -1,7 +1,6 @@
 name: controller
-home: https://github.com/deisthree/controller
+home: https://github.com/teamhephy/controller
 version: <Will be populated by the ci before publishing the chart>
-description: Deis Workflow Controller (API).
+description: Hephy Workflow Controller (API).
 maintainers:
-  - name: Deis Team
-    email: engineering@deis.com
+- email: team@teamhephy.com

charts/controller/templates/controller-deployment.yaml

@@ -1,4 +1,10 @@
+{{- if .Capabilities.APIVersions.Has "apps/v1" }}
+apiVersion: apps/v1
+{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" }}
 apiVersion: extensions/v1beta1
+{{- else }}
+apiVersion: apps/v1
+{{- end }}
 kind: Deployment
 metadata:
   name: deis-controller

rootfs/scheduler/mock.py

@@ -336,7 +336,7 @@ def delete_pods(pods, current, desired):
 
 
 def create_pods(url, labels, base, new_pods):
-    # Start by fetching available pods in the Namespace that fit the profile
+    # Start by fetching available pods in the Namespace that fit the procfile
     # and prune down if needed, Otherwise go into the addition logic here
     for _ in range(new_pods):
         data = base.copy()
@@ -391,6 +391,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:
+        # Try replacing both just in case one or the other exists (api backwards compatibility)
+        url = url.replace('_replicasets_', '_pods').replace('apis_apps_v1', 'api_v1')  # noqa
         url = url.replace('_replicasets_', '_pods').replace('apis_extensions_v1beta1', 'api_v1')  # noqa
     else:
         url = url.replace('_replicationcontrollers_', '_pods')
@@ -512,7 +514,9 @@ 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').replace('apis_apps_v1', 'api_v1')  # noqa
+    # Try replacing both just in case one or the other exists (api backwards compatibility)
+    pod_url = pod_url.replace('_replicasets', '_pods').replace('apis_extensions_v1beta1', 'api_v1')  # noqa
     while True:
         # The below needs to be done to emulate Deployment handling things
         # always cleanup pods

rootfs/scheduler/resources/deployment.py

@@ -13,8 +13,10 @@ class Deployment(Resource):
 
     @property
     def api_version(self):
+        # API locations have changed since 1.9 and deprecated in 1.16
+        # https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/
         if self.version() >= parse("1.9.0"):
-            return 'extensions/v1beta1'
+            return 'apps/v1'
 
         return 'extensions/v1beta1'
 

rootfs/scheduler/resources/ingress.py

@@ -23,6 +23,8 @@ def get(self, name=None, **kwargs):
         return response
 
     def create(self, ingress, namespace, hostname):
+        # Ingress API will be deprecated in 1.20 to use networking.k8s.io/v1beta1
+        # https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/
         url = "/apis/extensions/v1beta1/namespaces/%s/ingresses" % namespace
 
         data = {

rootfs/scheduler/resources/replicaset.py

@@ -1,12 +1,22 @@
 from scheduler.exceptions import KubeHTTPException
 from scheduler.resources import Resource
 
+from packaging.version import parse
+
 
 class ReplicaSet(Resource):
     api_prefix = 'apis'
-    api_version = 'extensions/v1beta1'
     short_name = 'rs'
 
+    @property
+    def api_version(self):
+        # API locations have changed since 1.9 and deprecated in 1.16
+        # https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/
+        if self.version() >= parse("1.9.0"):
+            return 'apps/v1'
+
+        return 'extensions/v1beta1'
+
     def get(self, namespace, name=None, **kwargs):
         """
         Fetch a single ReplicaSet or a list

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))