Merge branch 'master' into delete-setup-page

config_app/config_endpoints/api/__init__.py

@@ -150,10 +150,11 @@ 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.suconfig
 import config_app.config_endpoints.api.superuser
-import config_app.config_endpoints.api.user
 import config_app.config_endpoints.api.tar_config_loader
-
+import config_app.config_endpoints.api.user

config_app/config_endpoints/api/kubeconfig.py

@@ -0,0 +1,69 @@
+from flask import request
+
+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
+
+
+@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/kubernetes/config/populate')
+class KubernetesConfigurationPopulator(ApiResource):
+  """ Resource for populating the local configuration from the cluster's kubernetes secrets. """
+
+  @kubernetes_only
+  @nickname('scKubePopulateConfig')
+  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())
+
+    # 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,
+    # and all of the options create a new clean dir, so we'll never pollute configs)
+    combined = dict(**app.config)
+    combined.update(config_provider.get_config())
+    configure(combined)
+
+    return 200

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. """

config_app/config_endpoints/api/superuser.py

@@ -55,8 +55,8 @@ class SuperUserCustomCertificate(ApiResource):
 
     # Call the update script with config dir location to install the certificate immediately.
     if not app.config['TESTING']:
-      if subprocess.call([os.path.join(INIT_SCRIPTS_LOCATION, 'certs_install.sh')],
-                         env={ 'QUAYCONFIG': config_provider.get_config_dir_path() }) != 0:
+      cert_dir = os.path.join(config_provider.get_config_dir_path(), EXTRA_CA_DIRECTORY)
+      if subprocess.call([os.path.join(INIT_SCRIPTS_LOCATION, 'certs_install.sh')], env={ 'CERTDIR': cert_dir }) != 0:
         raise Exception('Could not install certificates')
 
     return '', 204