chore(controller): using the api_version instead of hard coding

Author: duanhongyi

rootfs/scheduler/resources/events.py

@@ -17,7 +17,7 @@ def create(self, namespace, name, message, **kwargs):
         url = self.api('/namespaces/{}/events'.format(namespace))
         data = {
             'kind': 'Event',
-            'apiVersion': 'v1',
+            'apiVersion': self.api_version,
             'count': kwargs.get('count', 1),
             'metadata': {
                 'creationTimestamp': datetime.now().strftime(DATETIME_FORMAT),

rootfs/scheduler/resources/limits.py

@@ -24,7 +24,7 @@ def create(self, namespace_name, name, **kwargs):
         """
         url = self.api("/namespaces/{}/limitranges".format(namespace_name))
         manifest = {
-            "apiVersion": "v1",
+            "apiVersion": self.api_version,
             "kind": "LimitRange",
             "metadata": {
                 "namespace": namespace_name,

rootfs/scheduler/resources/namespace.py

@@ -30,7 +30,7 @@ def create(self, namespace):
         url = self.api("/namespaces")
         data = {
             "kind": "Namespace",
-            "apiVersion": "v1",
+            "apiVersion": self.api_version,
             "metadata": {
                 "name": namespace,
                 "labels": {

rootfs/scheduler/resources/pod.py

@@ -142,7 +142,7 @@ def manifest(self, namespace, name, image, **kwargs):
         # create base pod structure
         manifest = {
             'kind': 'Pod',
-            'apiVersion': 'v1',
+            'apiVersion': self.api_version,
             'metadata': {
               'name': name,
               'namespace': namespace,

rootfs/scheduler/resources/pvc.py

@@ -6,13 +6,12 @@
 class PersistentVolumeClaim(Resource):
     short_name = 'pvc'
 
-    @staticmethod
-    def manifest(namespace, name, version=None, **kwargs):
+    def manifest(self, namespace, name, version=None, **kwargs):
         labels = {
             'heritage': 'drycc',
         }
         data = {
-            "apiVersion": "v1",
+            "apiVersion": self.api_version,
             "kind": "PersistentVolumeClaim",
             "metadata": {
                 "name": name,

rootfs/scheduler/resources/quota.py

@@ -25,7 +25,7 @@ def create(self, namespace_name, name, **kwargs):
         url = self.api("/namespaces/{}/resourcequotas".format(namespace_name))
         manifest = {
             "kind": "ResourceQuota",
-            "apiVersion": "v1",
+            "apiVersion": self.api_version,
             "metadata": {
                 "namespace": namespace_name,
                 "name": name,

rootfs/scheduler/resources/rc.py

@@ -31,7 +31,7 @@ def get(self, namespace, name=None, **kwargs):
     def create(self, namespace, name, image, entrypoint, command, **kwargs):
         manifest = {
             'kind': 'ReplicationController',
-            'apiVersion': 'v1',
+            'apiVersion': self.api_version,
             'metadata': {
                 'name': name,
                 'labels': {

rootfs/scheduler/resources/secret.py

@@ -51,7 +51,7 @@ def manifest(self, namespace, name, data, secret_type='Opaque', labels={}):
 
         manifest = {
             'kind': 'Secret',
-            'apiVersion': 'v1',
+            'apiVersion': self.api_version,
             'metadata': {
                 'name': name,
                 'namespace': namespace,

rootfs/scheduler/resources/service.py

@@ -31,7 +31,7 @@ def create(self, namespace, name, **kwargs):
         # Ports and app type will be overwritten as required
         manifest = {
             'kind': 'Service',
-            'apiVersion': 'v1',
+            'apiVersion': self.api_version,
             'metadata': {
                 'name': name,
                 'labels': {

rootfs/scheduler/resources/svcat.py

@@ -7,13 +7,12 @@ class ServiceCatalog(Resource):
     api_prefix = 'apis'
     short_name = 'svcat'
 
-    @staticmethod
-    def service_instance_manifest(namespace, name, version=None, **kwargs):
+    def service_instance_manifest(self, namespace, name, version=None, **kwargs):
         labels = {
             'heritage': 'drycc',
         }
         data = {
-            "apiVersion": 'servicecatalog.k8s.io/v1beta1',
+            "apiVersion": self.api_version,
             "kind": "ServiceInstance",
             "metadata": {
                 "name": name,
@@ -110,13 +109,12 @@ def delete_instance(self, namespace, name):
             raise KubeHTTPException(response, 'delete serviceinstance ' + name)
         return response
 
-    @staticmethod
-    def service_binding_manifest(namespace, name, version=None, **kwargs):
+    def service_binding_manifest(self, namespace, name, version=None, **kwargs):
         labels = {
             'heritage': 'drycc',
         }
         data = {
-            "apiVersion": 'servicecatalog.k8s.io/v1beta1',
+            "apiVersion": self.api_version,
             "kind": "ServiceBinding",
             "metadata": {
                 "name": name,