Add config ability to rollback changes on kube

config_app/config_endpoints/api/__init__.py

@@ -150,10 +150,8 @@ def kubernetes_only(f):
 nickname = partial(add_method_metadata, 'nickname')
 
 
-
-import config_app.config_endpoints.api
 import config_app.config_endpoints.api.discovery
-import config_app.config_endpoints.api.kubeconfig
+import config_app.config_endpoints.api.kube_endpoints
 import config_app.config_endpoints.api.suconfig
 import config_app.config_endpoints.api.superuser
 import config_app.config_endpoints.api.tar_config_loader

config_app/config_endpoints/api/kube_endpoints.py

@@ -1,10 +1,11 @@
-from flask import request
+from flask import request, make_response
 
+from config_app.config_util.config import get_config_as_kube_secret
 from data.database import configure
 
 from config_app.c_app import app, config_provider
-from config_app.config_endpoints.api import resource, ApiResource, nickname, kubernetes_only
-from config_app.config_util.k8saccessor import KubernetesAccessorSingleton
+from config_app.config_endpoints.api import resource, ApiResource, nickname, kubernetes_only, validate_json_request
+from config_app.config_util.k8saccessor import KubernetesAccessorSingleton, K8sApiException
 
 
 @resource('/v1/kubernetes/deployments/')
@@ -32,11 +33,13 @@ class SuperUserKubernetesDeployment(ApiResource):
     return KubernetesAccessorSingleton.get_instance().get_qe_deployments()
 
   @kubernetes_only
+  @validate_json_request('ValidateDeploymentNames')
   @nickname('scCycleQEDeployments')
   def put(self):
     deployment_names = request.get_json()['deploymentNames']
     return KubernetesAccessorSingleton.get_instance().cycle_qe_deployments(deployment_names)
 
+
 @resource('/v1/kubernetes/deployment/<deployment>/status')
 class QEDeploymentRolloutStatus(ApiResource):
   @kubernetes_only
@@ -49,14 +52,66 @@ class QEDeploymentRolloutStatus(ApiResource):
     }
 
 
-@resource('/v1/superuser/config/kubernetes')
+@resource('/v1/kubernetes/deployments/rollback')
+class QEDeploymentRollback(ApiResource):
+  """ Resource for rolling back deployments """
+  schemas = {
+    'ValidateDeploymentNames': {
+      'type': 'object',
+      'description': 'Validates deployment names for rolling back',
+      'required': [
+        'deploymentNames'
+      ],
+      'properties': {
+        'deploymentNames': {
+          'type': 'array',
+          'description': 'The names of the deployments to rollback'
+        },
+      },
+    }
+  }
+
+  @kubernetes_only
+  @nickname('scRollbackDeployments')
+  @validate_json_request('ValidateDeploymentNames')
+  def post(self):
+    """
+    Returns the config to its original state and rolls back deployments
+    :return:
+    """
+    deployment_names = request.get_json()['deploymentNames']
+
+    # To roll back a deployment, we must do 2 things:
+    # 1. Roll back the config secret to its old value (discarding changes we made in this session
+    # 2. Trigger a rollback to the previous revision, so that the pods will be restarted with
+    # the old config
+    old_secret = get_config_as_kube_secret(config_provider.get_old_config_dir())
+    kube_accessor = KubernetesAccessorSingleton.get_instance()
+    kube_accessor.replace_qe_secret(old_secret)
+
+    try:
+      for name in deployment_names:
+        kube_accessor.rollback_deployment(name)
+    except K8sApiException as e:
+      return make_response(e.message, 500)
+
+    return make_response('Ok', 204)
+
+
+@resource('/v1/kubernetes/config')
 class SuperUserKubernetesConfiguration(ApiResource):
   """ Resource for saving the config files to kubernetes secrets. """
 
   @kubernetes_only
   @nickname('scDeployConfiguration')
   def post(self):
-    return config_provider.save_configuration_to_kubernetes()
+    try:
+      new_secret = get_config_as_kube_secret(config_provider.get_config_dir_path())
+      KubernetesAccessorSingleton.get_instance().replace_qe_secret(new_secret)
+    except K8sApiException as e:
+      return make_response(e.message, 500)
+
+    return make_response('Ok', 201)
 
 
 @resource('/v1/kubernetes/config/populate')
@@ -68,7 +123,10 @@ class KubernetesConfigurationPopulator(ApiResource):
   def post(self):
     # Get a clean transient directory to write the config into
     config_provider.new_config_dir()
-    KubernetesAccessorSingleton.get_instance().save_secret_to_directory(config_provider.get_config_dir_path())
+
+    kube_accessor = KubernetesAccessorSingleton.get_instance()
+    kube_accessor.save_secret_to_directory(config_provider.get_config_dir_path())
+    config_provider.create_copy_of_config_dir()
 
     # We update the db configuration to connect to their specified one
     # (Note, even if this DB isn't valid, it won't affect much in the config app, since we'll report an error,

config_app/config_endpoints/api/tar_config_loader.py

@@ -52,6 +52,8 @@ class TarConfigLoader(ApiResource):
     with tarfile.open(mode="r|gz", fileobj=input_stream) as tar_stream:
       tar_stream.extractall(config_provider.get_config_dir_path())
 
+    config_provider.create_copy_of_config_dir()
+
     # now try to connect to the db provided in their config to validate it works
     combined = dict(**app.config)
     combined.update(config_provider.get_config())