0ct0pu5/flame
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enhance K8s and Docker features:

Browse source 
* Implement `description` and `visible` labels/annotations
* Find app by `name` or `url` instead of just `name` for update
This commit is contained in:
PortableProgrammer 2023-04-18 19:20:01 -06:00
parent 446b4095f6
commit 5282679f09
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
controllers/apps/docker/useDocker.js
View file

@ -92,15 +92,28 @@ const useDocker = async (apps) => {
const names = labels['flame.name'].split(';');
const urls = labels['flame.url'].split(';');
let icons = '';
let descriptions = '';
let visibility = '';
if ('flame.icon' in labels) {
icons = labels['flame.icon'].split(';');
}
if ('flame.description' in labels) {
descriptions = labels['flame.description'].split(';');
}
if ('flame.visible' in labels) {
visibility = labels['flame.visible'].split(';');
}
dockerApps.push({
name: names[i] || names[0],
url: urls[i] || urls[0],
icon: icons[i] || 'docker',
// Add description and visbility
description: descriptions[i] || '',
isPublic: (visibility[i] && /^true$/.test(visibility[i]) ? visibility[i] : visibility[0]) || null,
});
}
}
@ -114,8 +127,9 @@ const useDocker = async (apps) => {
for (const item of dockerApps) {
// If app already exists, update it
if (apps.some((app) => app.name === item.name)) {
const app = apps.find((a) => a.name === item.name);
// Find by name or url
if (apps.some((app) => app.name === item.name || app.url === item.url)) {
const app = apps.find((a) => a.name === item.name || app.url === item.url);
if (
item.icon === 'custom' ||
@ -125,6 +139,9 @@ const useDocker = async (apps) => {
await app.update({
name: item.name,
url: item.url,
// Add description and visbility
description: item.description,
isPublic: item.isPublic,
isPinned: true,
});
} else {

8
controllers/apps/docker/useKubernetes.js
View file

@ -43,6 +43,9 @@ const useKubernetes = async (apps) => {
name: annotations['flame.pawelmalak/name'],
url: annotations['flame.pawelmalak/url'],
icon: annotations['flame.pawelmalak/icon'] || 'kubernetes',
// Add description and visibility
description: annotations['flame.pawelmalak/description'] || '',
isPublic: (annotations['flame.pawelmalak/visible'] && /^true$/.test(annotations['flame.pawelmalak/visible']) ? 1 : 0),
});
}
}
@ -54,8 +57,9 @@ const useKubernetes = async (apps) => {
}
for (const item of kubernetesApps) {
if (apps.some((app) => app.name === item.name)) {
const app = apps.find((a) => a.name === item.name);
// Find by name or url
if (apps.some((app) => app.name === item.name || app.url === item.url)) {
const app = apps.find((a) => a.name === item.name || app.url === item.url);
await app.update({ ...item, isPinned: true });
} else {
await App.create({