From 0743f26ab8f7ce75d2100a70909c58d7da438fbd Mon Sep 17 00:00:00 2001 From: Matt Hook Date: Tue, 16 May 2023 09:21:50 +1200 Subject: [PATCH] fix(kube): updated kube terminology for configmaps/secrets [EE-4816] (#8770) --- .../configurationsDatatable.html | 2 +- .../applications/create/createApplication.html | 3 ++- .../views/applications/edit/application.html | 6 +++--- .../configurations/configurationsController.js | 8 ++++---- .../configurations/create/createConfiguration.html | 10 +++++----- .../create/createConfigurationController.js | 12 +++++++++--- .../views/configurations/edit/configuration.html | 4 ++-- .../configurations/edit/configurationController.js | 14 ++++++++++---- .../kubernetes/configs/CreateView/options.tsx | 4 ++-- 9 files changed, 38 insertions(+), 25 deletions(-) diff --git a/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html b/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html index 722ca5acb..d5c40635e 100644 --- a/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html +++ b/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html @@ -172,7 +172,7 @@ Loading... - No configuration available. + No ConfigMaps or Secrets available. diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html index 4847d5b26..8436350d4 100644 --- a/app/kubernetes/views/applications/create/createApplication.html +++ b/app/kubernetes/views/applications/create/createApplication.html @@ -414,7 +414,8 @@
The following keys will be loaded from the {{ config.SelectedConfiguration.Name }} - configuration as environment variables: + ConfigMapSecret as environment + variables: {{ key }}{{ $last ? '' : ', ' }} diff --git a/app/kubernetes/views/applications/edit/application.html b/app/kubernetes/views/applications/edit/application.html index aa1b1723c..745e3211a 100644 --- a/app/kubernetes/views/applications/edit/application.html +++ b/app/kubernetes/views/applications/edit/application.html @@ -209,12 +209,12 @@
- Configuration + ConfigMap or Secret
- This application is not using any environment variable or configuration. + This application is not using any environment variable, ConfigMap or Secret.
@@ -222,7 +222,7 @@ - + diff --git a/app/kubernetes/views/configurations/configurationsController.js b/app/kubernetes/views/configurations/configurationsController.js index c35846fd0..0e645fd36 100644 --- a/app/kubernetes/views/configurations/configurationsController.js +++ b/app/kubernetes/views/configurations/configurationsController.js @@ -28,7 +28,7 @@ class KubernetesConfigurationsController { this.configurations = await this.KubernetesConfigurationService.get(); KubernetesConfigurationHelper.setConfigurationsUsed(this.configurations, this.applications); } catch (err) { - this.Notifications.error('Failure', err, 'Unable to retrieve configurations'); + this.Notifications.error('Failure', err, 'Unable to retrieve ConfigMaps & Secrets'); } finally { this.state.configurationsLoading = false; } @@ -43,11 +43,11 @@ class KubernetesConfigurationsController { for (const configuration of selectedItems) { try { await this.KubernetesConfigurationService.delete(configuration); - this.Notifications.success('Configurations successfully removed', configuration.Name); + this.Notifications.success('ConfigMaps/Secrets successfully removed', configuration.Name); const index = this.configurations.indexOf(configuration); this.configurations.splice(index, 1); } catch (err) { - this.Notifications.error('Failure', err, 'Unable to remove configuration'); + this.Notifications.error('Failure', err, 'Unable to remove ConfigMaps/Secrets'); } finally { --actionCount; if (actionCount === 0) { @@ -58,7 +58,7 @@ class KubernetesConfigurationsController { } removeAction(selectedItems) { - confirmDelete('Do you want to remove the selected configuration(s)?').then((confirmed) => { + confirmDelete('Do you want to remove the selected ConfigMap(s) & Secret(s)?').then((confirmed) => { if (confirmed) { return this.$async(this.removeActionAsync, selectedItems); } diff --git a/app/kubernetes/views/configurations/create/createConfiguration.html b/app/kubernetes/views/configurations/create/createConfiguration.html index d4a9fba40..ec8663260 100644 --- a/app/kubernetes/views/configurations/create/createConfiguration.html +++ b/app/kubernetes/views/configurations/create/createConfiguration.html @@ -1,7 +1,7 @@ @@ -53,7 +53,7 @@ ng-model="ctrl.formValues.Name" ng-pattern="/^[a-z0-9]([a-z0-9-.]{0,61}[a-z0-9])?$/" ng-change="ctrl.onChangeName()" - placeholder="my-configuration" + placeholder="my-configmap-or-secret" auto-focus required data-cy="k8sConfigCreate-nameInput" @@ -81,10 +81,10 @@
-
Configuration kind
+
Kind
-
Select the kind of data that you want to save in the configuration.
+
Select the kind of data that you want to save.
diff --git a/app/kubernetes/views/configurations/create/createConfigurationController.js b/app/kubernetes/views/configurations/create/createConfigurationController.js index 4b4ecc0f4..7e2974466 100644 --- a/app/kubernetes/views/configurations/create/createConfigurationController.js +++ b/app/kubernetes/views/configurations/create/createConfigurationController.js @@ -140,6 +140,11 @@ class KubernetesCreateConfigurationController { } async createConfigurationAsync() { + let kind = 'ConfigMap'; + if (this.formValues.Kind === this.KubernetesConfigurationKinds.SECRET) { + kind = 'Secret'; + } + try { this.state.actionInProgress = true; this.formValues.ConfigurationOwner = this.Authentication.getUserDetails().username; @@ -148,11 +153,12 @@ class KubernetesCreateConfigurationController { } await this.KubernetesConfigurationService.create(this.formValues); - this.Notifications.success('Success', 'Configuration succesfully created'); + + this.Notifications.success('Success', `${kind} successfully created`); this.state.isEditorDirty = false; this.$state.go('kubernetes.configurations'); } catch (err) { - this.Notifications.error('Failure', err, 'Unable to create configuration'); + this.Notifications.error('Failure', err, `Unable to create ${kind}`); } finally { this.state.actionInProgress = false; } @@ -166,7 +172,7 @@ class KubernetesCreateConfigurationController { try { this.configurations = await this.KubernetesConfigurationService.get(); } catch (err) { - this.Notifications.error('Failure', err, 'Unable to retrieve configurations'); + this.Notifications.error('Failure', err, 'Unable to retrieve ConfigMaps and Secrets'); } } diff --git a/app/kubernetes/views/configurations/edit/configuration.html b/app/kubernetes/views/configurations/edit/configuration.html index c7a6efe52..e86e13aef 100644 --- a/app/kubernetes/views/configurations/edit/configuration.html +++ b/app/kubernetes/views/configurations/edit/configuration.html @@ -1,6 +1,6 @@ Configuration kind +
diff --git a/app/kubernetes/views/configurations/edit/configurationController.js b/app/kubernetes/views/configurations/edit/configurationController.js index ada9bdcff..d9d09af57 100644 --- a/app/kubernetes/views/configurations/edit/configurationController.js +++ b/app/kubernetes/views/configurations/edit/configurationController.js @@ -87,6 +87,11 @@ class KubernetesConfigurationController { // It looks like we're still doing a create/delete process but we've decided to get rid of this // approach. async updateConfigurationAsync() { + let kind = 'ConfigMap'; + if (this.formValues.Kind === KubernetesConfigurationKinds.SECRET) { + kind = 'Secret'; + } + try { this.state.actionInProgress = true; if ( @@ -96,7 +101,7 @@ class KubernetesConfigurationController { ) { await this.KubernetesConfigurationService.create(this.formValues); await this.KubernetesConfigurationService.delete(this.configuration); - this.Notifications.success('Success', 'Configuration succesfully updated'); + this.Notifications.success('Success', `${kind} successfully updated`); this.$state.go( 'kubernetes.configurations.configuration', { @@ -107,11 +112,11 @@ class KubernetesConfigurationController { ); } else { await this.KubernetesConfigurationService.update(this.formValues, this.configuration); - this.Notifications.success('Success', 'Configuration succesfully updated'); + this.Notifications.success('Success', `${kind} successfully updated`); this.$state.reload(this.$state.current); } } catch (err) { - this.Notifications.error('Failure', err, 'Unable to update configuration'); + this.Notifications.error('Failure', err, `Unable to update ${kind}`); } finally { this.state.actionInProgress = false; } @@ -120,8 +125,9 @@ class KubernetesConfigurationController { updateConfiguration() { if (this.configuration.Used) { const plural = this.configuration.Applications.length > 1 ? 's' : ''; + const thisorthese = this.configuration.Applications.length > 1 ? 'these' : 'this'; confirmUpdate( - `The changes will be propagated to ${this.configuration.Applications.length} running application${plural}. Are you sure you want to update this configuration?`, + `The changes will be propagated to ${this.configuration.Applications.length} running application${plural}. Are you sure you want to update ${thisorthese} ConfigMap${plural} or Secret${plural}?`, (confirmed) => { if (confirmed) { return this.$async(this.updateConfigurationAsync); diff --git a/app/react/kubernetes/configs/CreateView/options.tsx b/app/react/kubernetes/configs/CreateView/options.tsx index cec821195..249faedf6 100644 --- a/app/react/kubernetes/configs/CreateView/options.tsx +++ b/app/react/kubernetes/configs/CreateView/options.tsx @@ -10,7 +10,7 @@ export const typeOptions: ReadonlyArray> = [ icon: FileCode, iconType: 'badge', label: 'ConfigMap', - description: 'This configuration holds non-sensitive information', + description: 'This kind holds non-sensitive information', }, { id: 'type_secret', @@ -18,6 +18,6 @@ export const typeOptions: ReadonlyArray> = [ icon: Lock, iconType: 'badge', label: 'Secret', - description: 'This configuration holds sensitive information', + description: 'This kind holds sensitive information', }, ] as const;
Container Environment variable ValueConfigurationConfigMap or Secret
Kind {{ ctrl.configuration.Kind | kubernetesConfigurationKindText }}