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

chore(deps): upgrade tailwind and prettier [EE-5218] (#10068)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-09-04 16:20:36 +01:00 • committed by GitHub
parent cb7377ead6
commit 0e2eb17220
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 444 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/react/kubernetes/applications/utils.ts
View file

@ -233,23 +233,31 @@ export function getRollbackPatchPayload(
// keep the annotations to skip from the deployment, in the patch
const applicationAnnotations = application.metadata?.annotations || {};
const applicationAnnotationsInPatch =
unchangedAnnotationKeysForRollbackPatch.reduce((acc, annotationKey) => {
if (applicationAnnotations[annotationKey]) {
acc[annotationKey] = applicationAnnotations[annotationKey];
}
return acc;
}, {} as Record<string, string>);
unchangedAnnotationKeysForRollbackPatch.reduce(
(acc, annotationKey) => {
if (applicationAnnotations[annotationKey]) {
acc[annotationKey] = applicationAnnotations[annotationKey];
}
return acc;
},
{} as Record<string, string>
);
// add any annotations from the target revision that shouldn't be skipped
const revisionAnnotations = previousRevision.metadata?.annotations || {};
const revisionAnnotationsInPatch = Object.entries(
revisionAnnotations
).reduce((acc, [annotationKey, annotationValue]) => {
if (!unchangedAnnotationKeysForRollbackPatch.includes(annotationKey)) {
acc[annotationKey] = annotationValue;
}
return acc;
}, {} as Record<string, string>);
).reduce(
(acc, [annotationKey, annotationValue]) => {
if (
!unchangedAnnotationKeysForRollbackPatch.includes(annotationKey)
) {
acc[annotationKey] = annotationValue;
}
return acc;
},
{} as Record<string, string>
);
const patchAnnotations = {
...applicationAnnotationsInPatch,