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

fix(pods): don't add labels to old pod that has none [EE-6587] (#11009)

pull/10934/head
Ali 2024-01-24 14:44:15 +13:00 committed by GitHub
parent 3ccc764d40
commit 26e52a0f00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/kubernetes/pod/converter.js
View File

@ -166,10 +166,16 @@ function createPayload(pod) {
const payload = createPayloadFactory(); const payload = createPayloadFactory();
payload.metadata.name = pod.Name; payload.metadata.name = pod.Name;
payload.metadata.namespace = pod.Namespace; payload.metadata.namespace = pod.Namespace;
payload.metadata.labels[KubernetesPortainerApplicationStackNameLabel] = pod.StackName; // it's possible for pods not to have labels. Keep labels empty in the oldpayload if there aren't any, otherwise patch will fail
payload.metadata.labels[KubernetesPortainerApplicationNameLabel] = pod.ApplicationName; // TODO: when migrating to react, the oldValues should just be the fetched manifest directly from the kube api
payload.metadata.labels[KubernetesPortainerApplicationOwnerLabel] = pod.ApplicationOwner; if (Object.keys(pod.Labels || {}).length || Object.keys(pod.ServiceSelector || {}).length) {
payload.metadata.labels = { ...(pod.Labels || {}), ...(pod.ServiceSelector || {}), ...payload.metadata.labels }; payload.metadata.labels[KubernetesPortainerApplicationStackNameLabel] = pod.StackName;
payload.metadata.labels[KubernetesPortainerApplicationNameLabel] = pod.ApplicationName;
payload.metadata.labels[KubernetesPortainerApplicationOwnerLabel] = pod.ApplicationOwner;
payload.metadata.labels = { ...(pod.Labels || {}), ...(pod.ServiceSelector || {}), ...payload.metadata.labels };
} else {
payload.metadata.labels = undefined;
}
if (pod.Note) { if (pod.Note) {
payload.metadata.annotations[KubernetesPortainerApplicationNote] = pod.Note; payload.metadata.annotations[KubernetesPortainerApplicationNote] = pod.Note;
} else { } else {