From efdedba2aec28b4a19606d4071c459347c7f0e10 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Fri, 13 Jan 2017 15:50:50 -0500 Subject: [PATCH] Superuser config tool warnings Adds warnings displayed in the superuser config tool that the changes made will only be applied to the local instance (in non-k8s case) or that a deployment is required (in the k8s case) [Delivers #137537413] --- endpoints/api/suconfig.py | 1 + static/js/pages/superuser.js | 1 + static/partials/super-user.html | 13 ++++++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/endpoints/api/suconfig.py b/endpoints/api/suconfig.py index eedbd15f0..db5050489 100644 --- a/endpoints/api/suconfig.py +++ b/endpoints/api/suconfig.py @@ -61,6 +61,7 @@ class SuperUserRegistryStatus(ApiResource): # If we have SETUP_COMPLETE, then we're ready to go! if app.config.get('SETUP_COMPLETE', False): return { + 'provider_id': config_provider.provider_id, 'requires_restart': config_provider.requires_restart(app.config), 'status': 'ready' } diff --git a/static/js/pages/superuser.js b/static/js/pages/superuser.js index 4751c0b67..5557bca67 100644 --- a/static/js/pages/superuser.js +++ b/static/js/pages/superuser.js @@ -197,6 +197,7 @@ $('#restartingContainerModal').modal('hide'); $scope.configStatus = resp['status']; $scope.requiresRestart = resp['requires_restart']; + $scope.configProviderId = resp['provider_id']; if ($scope.configStatus == 'ready') { $scope.currentConfig = null; diff --git a/static/partials/super-user.html b/static/partials/super-user.html index 68605654c..eddde9a74 100644 --- a/static/partials/super-user.html +++ b/static/partials/super-user.html @@ -1,7 +1,7 @@
-
+
@@ -9,6 +9,14 @@
Container restart required!
Configuration changes have been made but the container hasn't been restarted yet.
+
+ +
Container restarts required!
+ Configuration changes have been made to the Kubernetes secret but they will not be applied to + your cluster until the containers are restarted. Please issue a rolling deployment now to apply + these changes to the cluster. +
+
Quay Enterprise Management @@ -51,6 +59,9 @@
+
+ Warning: If you are running Quay Enterprise under multiple containers, additional actions are necessary in order to apply any configuration changes made here to the entire cluster. It is recommended to make (and validate) configuration changes here, then copy your configuration to all instances and restart them. +