Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 07:49:41 +02:00
Code Issues Releases Activity

fix(app): various persisted folder fixes [EE-6235] (#10963)

Browse source 
Co-authored-by: testa113 <testa113>
This commit is contained in:
Ali 2024-01-17 08:31:22 +13:00 • committed by GitHub
parent 7a04d1d4ea
commit 95474b7dc5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 84 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/react/kubernetes/applications/components/PersistedFoldersFormSection/PersistedFolderItem.tsx
View file

@ -16,7 +16,7 @@ import { ApplicationFormValues } from '../../types';
import { ExistingVolume, PersistedFolderFormValue } from './types';
type Props = {
initialValues: PersistedFolderFormValue[];
initialValues?: PersistedFolderFormValue[];
item: PersistedFolderFormValue;
onChange: (value: PersistedFolderFormValue) => void;
error: ItemError<PersistedFolderFormValue>;
@ -220,7 +220,6 @@ export function PersistedFolderItem({
function isToggleVolumeTypeVisible() {
return (
!(isEdit && isExistingPersistedFolder()) && // if it's not an edit of an existing persisted folder
applicationValues.ApplicationType !== 'StatefulSet' && // and if it's not a statefulset
applicationValues.Containers.length <= 1 // and if there is only one container);
);
}

45
app/react/kubernetes/applications/components/PersistedFoldersFormSection/PersistedFoldersFormSection.tsx
View file

@ -57,7 +57,10 @@ export function PersistedFoldersFormSection({
value={values}
onChange={onChange}
errors={errors}
isDeleteButtonHidden={isDeleteButtonHidden()}
isDeleteButtonHidden={
isEdit && applicationValues.ApplicationType === 'StatefulSet'
}
canUndoDelete={isEdit}
deleteButtonDataCy="k8sAppCreate-persistentFolderRemoveButton"
addButtonDataCy="k8sAppCreate-persistentFolderAddButton"
disabled={storageClasses.length === 0}
@ -77,33 +80,20 @@ export function PersistedFoldersFormSection({
initialValues={initialValues}
/>
)}
itemBuilder={() => {
const newVolumeClaimName = `${applicationValues.Name}-${uuidv4()}`;
return {
persistentVolumeClaimName:
availableVolumes[0]?.PersistentVolumeClaim.Name ||
newVolumeClaimName,
containerPath: '',
size: '',
sizeUnit: 'GB',
storageClass: storageClasses[0],
useNewVolume: true,
existingVolume: undefined,
needsDeletion: false,
};
}}
itemBuilder={() => ({
persistentVolumeClaimName: getNewPVCName(applicationValues.Name),
containerPath: '',
size: '',
sizeUnit: 'GB',
storageClass: storageClasses[0],
useNewVolume: true,
existingVolume: undefined,
needsDeletion: false,
})}
addLabel="Add persisted folder"
canUndoDelete={isEdit}
/>
</FormSection>
);
function isDeleteButtonHidden() {
return (
(isEdit && applicationValues.ApplicationType === 'StatefulSet') ||
applicationValues.Containers.length >= 1
);
}
}
function usePVCOptions(existingPVCs: ExistingVolume[]): Option<string>[] {
@ -123,3 +113,10 @@ function getAddButtonError(storageClasses: StorageClass[]) {
}
return '';
}
function getNewPVCName(applicationName: string) {
const name = `${applicationName}-${uuidv4()}`;
// limit it to 63 characters to avoid exceeding the limit for the volume name
const nameLimited = name.length > 63 ? name.substring(0, 63) : name;
return nameLimited;
}