mirror of https://github.com/portainer/portainer
Ali
GitHub
parent
88de50649f
commit
73010efd8d
|
|
@ -14,9 +14,13 @@
|
|||
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
|
||||
Switch to advanced mode to copy and paste multiple key/values
|
||||
</div>
|
||||
<div class="col-sm-12 small text-muted vertical-center" ng-if="!$ctrl.formValues.IsSimple">
|
||||
<div class="col-sm-12 small text-muted vertical-center" ng-if="!$ctrl.formValues.IsSimple && $ctrl.type === 'configmap'">
|
||||
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
|
||||
Generate a configuration entry per line, use YAML format
|
||||
Generate a ConfigMap entry per line, use YAML format
|
||||
</div>
|
||||
<div class="col-sm-12 small text-muted vertical-center" ng-if="!$ctrl.formValues.IsSimple && $ctrl.type === 'secret'">
|
||||
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
|
||||
Generate a Secret entry per line, use YAML format
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@ angular.module('portainer.kubernetes').component('kubernetesConfigurationData',
|
|||
isValid: '=',
|
||||
isCreation: '=',
|
||||
isEditorDirty: '=',
|
||||
type: '<',
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
></kubernetes-configuration-data>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
></kubernetes-configuration-data>
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
|
||||
<span>
|
||||
More information about types of secret can be found in the official
|
||||
<a class="hyperlink" href="https://kubernetes.io/docs/concepts/configuration/secret/#secret-types" target="_blank">kubernetes documentation</a>.
|
||||
<a class="hyperlink" href="https://kubernetes.io/docs/concepts/configuration/secret/#secret-types" target="_blank">Kubernetes documentation</a>.
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -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"
|
||||
></kubernetes-configuration-data>
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
></kubernetes-configuration-data>
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
/>
|
||||
<div className="ml-8 basis-1/2">
|
||||
<div className="text-muted ml-8 basis-1/2 text-xs">
|
||||
Expose the application workload via{' '}
|
||||
<a
|
||||
href="https://kubernetes.io/docs/concepts/services-networking/service/"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ export function confirmDeleteAccess() {
|
|||
environment. Removing the registry access could lead to a service
|
||||
interruption for these applications.
|
||||
</p>
|
||||
<p>Do you wish to continue?</p>
|
||||
<p>Are you sure you wish to continue?</p>
|
||||
</>
|
||||
),
|
||||
confirmButton: buildConfirmButton('Remove', 'danger'),
|
||||
|
|
|
|||
|
|
@ -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(', ')
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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(', ')
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue