github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(app): persisted volume fixes [EE-6554] (#10975) 

Co-authored-by: testa113 <testa113>
pull/10981/head
Ali 2024-01-19 12:14:19 +13:00 committed by GitHub
parent fa63432695
commit 59f642ea56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/kubernetes/views/applications/create/createApplicationController.js
View File

@ -372,6 +372,10 @@ class KubernetesCreateApplicationController {
onChangePersistedFolder(values) { onChangePersistedFolder(values) {
this.$scope.$evalAsync(() => { this.$scope.$evalAsync(() => {
this.state.persistedFoldersUseExistingVolumes = values.some((pf) => pf.existingVolume);
if (!this.state.isEdit && this.state.persistedFoldersUseExistingVolumes) {
this.formValues.DataAccessPolicy = this.ApplicationDataAccessPolicies.Shared;
}
this.formValues.PersistedFolders = values; this.formValues.PersistedFolders = values;
if (values && values.length && !this.supportGlobalDeployment()) { if (values && values.length && !this.supportGlobalDeployment()) {
this.onChangeDeploymentType(this.ApplicationDeploymentTypes.Replicated); this.onChangeDeploymentType(this.ApplicationDeploymentTypes.Replicated);

23
app/react/kubernetes/applications/CreateView/DataAccessPolicyFormSection.tsx
View File

@ -1,6 +1,8 @@
import { Box, Boxes } from 'lucide-react'; import { Box, Boxes } from 'lucide-react';
import { BoxSelector, BoxSelectorOption } from '@@/BoxSelector'; import { BoxSelector, BoxSelectorOption } from '@@/BoxSelector';
import { FormSection } from '@@/form-components/FormSection';
import { TextTip } from '@@/Tip/TextTip';
import { AppDataAccessPolicy } from '../types'; import { AppDataAccessPolicy } from '../types';
@ -20,13 +22,18 @@ export function DataAccessPolicyFormSection({
const options = getOptions(value, isEdit, persistedFoldersUseExistingVolumes); const options = getOptions(value, isEdit, persistedFoldersUseExistingVolumes);
return ( return (
<BoxSelector <FormSection title="Data access policy" titleSize="sm">
slim <TextTip color="blue">
options={options} Specify how the data will be used across instances.
value={value} </TextTip>
onChange={onChange} <BoxSelector
radioName="data_access_policy" slim
/> options={options}
value={value}
onChange={onChange}
radioName="data_access_policy"
/>
</FormSection>
); );
} }
@ -65,7 +72,7 @@ function getOptions(
} }
return ''; return '';
}, },
disabled: () => persistedFoldersUseExistingVolumes, disabled: () => isEdit && value !== 'Shared',
}, },
] as const; ] as const;
} }

2
app/react/kubernetes/applications/components/PersistedFoldersFormSection/PersistedFolderItem.tsx
View File

@ -204,7 +204,7 @@ export function PersistedFolderItem({
isDisabled={ isDisabled={
(isEdit && isExistingPersistedFolder()) || (isEdit && isExistingPersistedFolder()) ||
applicationValues.Containers.length > 1 || applicationValues.Containers.length > 1 ||
availableVolumes.length <= 1 availableVolumes.length < 1
} }
data-cy={`k8sAppCreate-pvcSelect_${index}`} data-cy={`k8sAppCreate-pvcSelect_${index}`}
/> />

4
app/react/kubernetes/applications/components/PersistedFoldersFormSection/persistedFoldersValidation.ts
View File

@ -103,8 +103,8 @@ function existingVolumeValidation(): SchemaOf<ExistingVolume> {
Storage: string().required(), Storage: string().required(),
storageClass: storageClassValidation(), storageClass: storageClassValidation(),
CreationDate: string().required(), CreationDate: string().required(),
ApplicationOwner: string().required(), ApplicationOwner: string(),
ApplicationName: string().required(), ApplicationName: string(),
PreviousName: string(), PreviousName: string(),
MountPath: string(), MountPath: string(),
Yaml: string(), Yaml: string(),

4
app/react/kubernetes/applications/components/PersistedFoldersFormSection/types.ts
View File

@ -19,8 +19,8 @@ export type ExistingVolume = {
Storage: string; Storage: string;
storageClass: StorageClass; storageClass: StorageClass;
CreationDate: string; CreationDate: string;
ApplicationOwner: string; ApplicationOwner?: string;
ApplicationName: string; ApplicationName?: string;
PreviousName?: string; PreviousName?: string;
MountPath?: string; MountPath?: string;
Yaml?: string; Yaml?: string;