diff --git a/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html b/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html index bdc100700..0acc26fc2 100644 --- a/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html +++ b/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html @@ -14,9 +14,13 @@ Switch to advanced mode to copy and paste multiple key/values -
+
- Generate a configuration entry per line, use YAML format + Generate a ConfigMap entry per line, use YAML format +
+
+ + Generate a Secret entry per line, use YAML format
diff --git a/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.js b/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.js index 47b33dcdc..8c9289fc1 100644 --- a/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.js +++ b/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.js @@ -8,5 +8,6 @@ angular.module('portainer.kubernetes').component('kubernetesConfigurationData', isValid: '=', isCreation: '=', isEditorDirty: '=', + type: '<', }, }); diff --git a/app/kubernetes/views/configurations/configmap/create/createConfigMap.html b/app/kubernetes/views/configurations/configmap/create/createConfigMap.html index 7811c3e6f..1dc37cf84 100644 --- a/app/kubernetes/views/configurations/configmap/create/createConfigMap.html +++ b/app/kubernetes/views/configurations/configmap/create/createConfigMap.html @@ -88,6 +88,7 @@ is-valid="ctrl.state.isDataValid" on-change-validation="ctrl.isFormValid()" is-creation="true" + type="'configmap'" is-editor-dirty="ctrl.state.isEditorDirty" > diff --git a/app/kubernetes/views/configurations/configmap/edit/configMap.html b/app/kubernetes/views/configurations/configmap/edit/configMap.html index 53fd317ee..63197417b 100644 --- a/app/kubernetes/views/configurations/configmap/edit/configMap.html +++ b/app/kubernetes/views/configurations/configmap/edit/configMap.html @@ -100,6 +100,7 @@ is-valid="ctrl.state.isDataValid" on-change-validation="ctrl.isFormValid()" is-creation="false" + type="'configmap'" is-editor-dirty="ctrl.state.isEditorDirty" > diff --git a/app/kubernetes/views/configurations/secret/create/createSecret.html b/app/kubernetes/views/configurations/secret/create/createSecret.html index fe48df2f2..f2ea1e2d5 100644 --- a/app/kubernetes/views/configurations/secret/create/createSecret.html +++ b/app/kubernetes/views/configurations/secret/create/createSecret.html @@ -87,7 +87,7 @@ More information about types of secret can be found in the official - kubernetes documentation. + Kubernetes documentation. @@ -186,6 +186,7 @@ is-valid="ctrl.state.isDataValid" on-change-validation="ctrl.isFormValid()" is-creation="true" + type="'secret'" is-editor-dirty="ctrl.state.isEditorDirty" > diff --git a/app/kubernetes/views/configurations/secret/edit/secret.html b/app/kubernetes/views/configurations/secret/edit/secret.html index 7d21f2434..b4103f3b2 100644 --- a/app/kubernetes/views/configurations/secret/edit/secret.html +++ b/app/kubernetes/views/configurations/secret/edit/secret.html @@ -107,6 +107,7 @@ is-valid="ctrl.state.isDataValid" on-change-validation="ctrl.isFormValid()" is-creation="false" + type="'secret'" is-editor-dirty="ctrl.state.isEditorDirty" > diff --git a/app/react/kubernetes/applications/CreateView/application-services/PublishingExplaination.tsx b/app/react/kubernetes/applications/CreateView/application-services/PublishingExplaination.tsx index 1dd9db746..80a577983 100644 --- a/app/react/kubernetes/applications/CreateView/application-services/PublishingExplaination.tsx +++ b/app/react/kubernetes/applications/CreateView/application-services/PublishingExplaination.tsx @@ -10,9 +10,9 @@ export function PublishingExplaination() { src={ingressDiagram} alt="ingress explaination" width={646} - className="flex w-full max-w-2xl basis-1/2 flex-col object-contain lg:w-1/2" + className="flex w-full max-w-2xl basis-1/2 flex-col rounded border border-solid border-gray-5 object-contain lg:w-1/2" /> -
+
Expose the application workload via{' '} -

Do you wish to continue?

+

Are you sure you wish to continue?

), confirmButton: buildConfirmButton('Remove', 'danger'), diff --git a/app/react/kubernetes/configs/configmap.service.ts b/app/react/kubernetes/configs/configmap.service.ts index 5f8082899..adcaa5d9e 100644 --- a/app/react/kubernetes/configs/configmap.service.ts +++ b/app/react/kubernetes/configs/configmap.service.ts @@ -9,6 +9,7 @@ import { notifySuccess, } from '@/portainer/services/notifications'; import { isFulfilled, isRejected } from '@/portainer/helpers/promise-utils'; +import { pluralize } from '@/portainer/helpers/strings'; import { parseKubernetesAxiosError } from '../axiosError'; @@ -104,7 +105,10 @@ export function useMutationDeleteConfigMaps(environmentId: EnvironmentId) { // show one summary message for all successful deletes if (successfulConfigMaps.length) { notifySuccess( - 'ConfigMaps successfully removed', + `${pluralize( + successfulConfigMaps.length, + 'ConfigMap' + )} successfully removed`, successfulConfigMaps.join(', ') ); } diff --git a/app/react/kubernetes/configs/secret.service.ts b/app/react/kubernetes/configs/secret.service.ts index 01c3b99f4..4297162ac 100644 --- a/app/react/kubernetes/configs/secret.service.ts +++ b/app/react/kubernetes/configs/secret.service.ts @@ -9,6 +9,7 @@ import { notifySuccess, } from '@/portainer/services/notifications'; import { isFulfilled, isRejected } from '@/portainer/helpers/promise-utils'; +import { pluralize } from '@/portainer/helpers/strings'; import { parseKubernetesAxiosError } from '../axiosError'; @@ -100,7 +101,10 @@ export function useMutationDeleteSecrets(environmentId: EnvironmentId) { // show one summary message for all successful deletes if (successfulSecrets.length) { notifySuccess( - 'Secrets successfully removed', + `${pluralize( + successfulSecrets.length, + 'Secret' + )} successfully removed`, successfulSecrets.join(', ') ); }