chore(controller): add volume expand support use patch

Author: jianxiaoguo

charts/controller/templates/controller-ingress.yaml

@@ -25,7 +25,7 @@ spec:
         {{- end }}
         backend:
           service:
-            name: drycc-controller
+            name: drycc-controller-api
             port:
               number: 80
   {{- if .Values.global.certManagerEnabled }}

rootfs/api/models/volume.py

@@ -46,7 +46,7 @@ def expand(self, size):
                 "size": self._get_size(self.size),
                 "storage_class": settings.DRYCC_APP_STORAGE_CLASS,
             }
-            self._scheduler.pvc.put(self.app.id, self.name, **kwargs)
+            self._scheduler.pvc.patch(self.app.id, self.name, **kwargs)
         except KubeException as e:
             msg = 'There was a problem expand the volume ' \
                     '{} for {}'.format(self.name, self.app_id)

rootfs/api/tests/test_volume.py

@@ -86,13 +86,13 @@ def test_volume_expand(self, mock_requests):
         data = {'name': 'myvolume1', 'size': '500G'}
         self.client.post('/v2/apps/{}/volumes'.format(app_id), data=data)
 
-        # Put
+        # Patch
         url = '/v2/apps/{app_id}/volumes/{volume}'.format(app_id=app_id,
                                                           volume='myvolume1')
-        response = self.client.put(url, {'name': 'myvolume1', 'size': '100G'})
+        response = self.client.patch(url, {'name': 'myvolume1', 'size': '100G'})
         self.assertEqual(response.status_code, 400)
 
-        response = self.client.put(url, {'name': 'myvolume1', 'size': '1024G'})
+        response = self.client.patch(url, {'name': 'myvolume1', 'size': '1024G'})
         self.assertEqual(response.status_code, 200)
         # Fetch
         url = '/v2/apps/{app_id}/volumes'.format(app_id=app_id)

rootfs/api/urls.py

@@ -79,7 +79,7 @@
     url(r"^apps/(?P<id>{})/volumes/?$".format(settings.APP_URL_REGEX),
         views.AppVolumesViewSet.as_view({'get': 'list', 'post': 'create'})),
     url(r"^apps/(?P<id>{})/volumes/(?P<name>[-_\w]+)/?$".format(settings.APP_URL_REGEX),
-        views.AppVolumesViewSet.as_view({'put': 'expand', 'delete': 'destroy'})),
+        views.AppVolumesViewSet.as_view({'patch': 'expand', 'delete': 'destroy'})),
     url(r"^apps/(?P<id>{})/volumes/(?P<name>[-_\w]+)/path/?$".format(settings.APP_URL_REGEX),
         views.AppVolumeMountPathViewSet.as_view({'patch': 'path'})),
     # application resources

rootfs/bin/boot

@@ -4,7 +4,7 @@
 #
 
 # fail hard and fast even on pipelines
-set -eo pipefail
+set -e
 
 # set debug based on envvar
 [[ $DRYCC_DEBUG == "true" ]] && set -x

rootfs/scheduler/mock.py

@@ -799,6 +799,79 @@ def put(request, context):
     return request.json()
 
 
+def patch(request, context):
+    """Process a PATCH request to the kubernetes API"""
+    url = cache_key(request.url)
+    # type is the second last element
+    resource_type = get_type(request.url)
+    # check if the namespace being posted to exists
+    if resource_type != 'namespaces':
+        namespace = get_namespace(url, resource_type)
+        if cache.get(namespace) is None:
+            context.status_code = 404
+            context.reason = 'Not Found'
+            return {}
+
+    # figure out main resource if in subresource
+    original_url = url
+    subresource, resource_type, url = is_subresource(resource_type, url)
+    if subresource != resource_type:
+        cache.set(original_url, request.json(), None)
+
+    item = cache.get(url)
+    if item is None:
+        context.status_code = 404
+        context.reason = 'Not Found'
+        return {}
+    # raise a 503 when we want to intentionally test for it
+    elif item['metadata']['name'] == 'image-pull-failed-test':
+        context.status_code = 503
+        context.reason = 'Network Unreachable'
+        return {}
+
+    data = request.json()
+
+    # merge new data into old but keep labels separate in case they changed
+    if 'labels' in data['metadata']:
+        labels = data['metadata'].pop('labels')
+        item['metadata'].update(data['metadata'])
+        data['metadata'] = item['metadata']
+        # make sure only new labels are used
+        data['metadata']['labels'] = labels
+
+    # split out deployments and replicasets? due to upsert_pods
+    if resource_type in ['replicationcontrollers', 'replicasets', 'deployments']:
+        if subresource == 'scale':
+            # has minimal info so need to copy data
+            replicas = data['spec']['replicas']
+            data = copy.deepcopy(item)  # full copy
+            data['spec']['replicas'] = replicas
+
+        if 'status' not in data:
+            # just use what was set last time
+            data['status'] = {'observedGeneration': item['status']['observedGeneration']}
+
+        data['metadata']['resourceVersion'] += 1
+        data['metadata']['generation'] += 1
+        data['status']['observedGeneration'] += 1
+
+        # Update the individual resource
+        cache.set(url, data, None)
+
+        if resource_type in ['replicationcontrollers', 'replicasets']:
+            upsert_pods(data, url)
+        elif resource_type == 'deployments':
+            manage_replicasets(data, url)
+    else:
+        # Update the individual resource
+        cache.set(url, data, None)
+
+    context.status_code = 200
+    context.reason = 'OK'
+
+    return request.json()
+
+
 def delete(request, context):
     """Process a DELETE request to the kubernetes API"""
     url = cache_key(request.url)
@@ -892,6 +965,8 @@ def mock_kubernetes(request, context):
         response = get(request, context)
     elif request.method == 'PUT':
         response = put(request, context)
+    elif request.method == 'PATCH':
+        response = patch(request, context)
     elif request.method == 'DELETE':
         response = delete(request, context)
 

rootfs/scheduler/resources/pvc.py

@@ -65,14 +65,14 @@ def create(self, namespace, name, **kwargs):
                 "create persistentvolumeclaim {}".format(namespace))
         return response
 
-    def put(self, namespace, name, **kwargs):
+    def patch(self, namespace, name, **kwargs):
         url = self.api('/namespaces/{}/persistentvolumeclaims/{}', namespace,
                        name)
         data = self.manifest(namespace, name, **kwargs)
-        response = self.http_put(url, json=data)
+        response = self.http_patch(url, json=data, headers={"Content-Type": "application/merge-patch+json"})  # noqa
         if self.unhealthy(response.status_code):
             self.log(namespace, 'template used: {}'.format(json.dumps(data, indent=4)), 'DEBUG')  # noqa
-            raise KubeHTTPException(response, 'update HorizontalPodAutoscaler "{}"', name)
+            raise KubeHTTPException(response, 'update persistentvolumeclaims "{}"', name)
         return response
 
     def delete(self, namespace, name):