Merge branch 'master' into delete-setup-page

config_app/config_endpoints/api/suconfig.py

@@ -3,11 +3,9 @@ import logging
 from flask import abort, request
 
 from config_app.config_endpoints.api.suconfig_models_pre_oci import pre_oci_model as model
-from config_app.config_endpoints.api import resource, ApiResource, nickname, validate_json_request, \
-  kubernetes_only
+from config_app.config_endpoints.api import resource, ApiResource, nickname, validate_json_request
 from config_app.c_app import (app, config_provider, superusers, ip_resolver,
                               instance_keys, INIT_SCRIPTS_LOCATION)
-from config_app.config_util.k8saccessor import KubernetesAccessorSingleton
 
 from data.database import configure
 from data.runmigration import run_alembic_migration
@@ -270,47 +268,6 @@ class SuperUserConfigValidate(ApiResource):
     return validate_service_for_config(service, validator_context)
 
 
-@resource('/v1/kubernetes/deployments/')
-class SuperUserKubernetesDeployment(ApiResource):
-  """ Resource for the getting the status of Quay Enterprise deployments and cycling them """
-  schemas = {
-    'ValidateDeploymentNames': {
-      'type': 'object',
-      'description': 'Validates deployment names for cycling',
-      'required': [
-        'deploymentNames'
-      ],
-      'properties': {
-        'deploymentNames': {
-          'type': 'array',
-          'description': 'The names of the deployments to cycle'
-        },
-      },
-    }
-  }
-
-  @kubernetes_only
-  @nickname('scGetNumDeployments')
-  def get(self):
-    return KubernetesAccessorSingleton.get_instance().get_qe_deployments()
-
-  @kubernetes_only
-  @nickname('scCycleQEDeployments')
-  def put(self):
-    deployment_names = request.get_json()['deploymentNames']
-    return KubernetesAccessorSingleton.get_instance().cycle_qe_deployments(deployment_names)
-
-
-@resource('/v1/superuser/config/kubernetes')
-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()
-
-
 @resource('/v1/superuser/config/file/<filename>')
 class SuperUserConfigFile(ApiResource):
   """ Resource for fetching the status of config files and overriding them. """