diff --git a/src/utils/config/api-response.js b/src/utils/config/api-response.js index 37c80055..3309eeed 100644 --- a/src/utils/config/api-response.js +++ b/src/utils/config/api-response.js @@ -175,6 +175,9 @@ export async function servicesResponse() { // this is a nested group, so find the parent group and merge the services mergeSubgroups(configuredServices, mergedGroup); } else unsortedGroups.push(mergedGroup); + } else if (configuredGroup.parent) { + // this is a nested group, so find the parent group and merge the services + mergeSubgroups(configuredServices, mergedGroup); } else { unsortedGroups.push(mergedGroup); } diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index c7b90ec7..59c270f5 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -214,7 +214,7 @@ export async function servicesFromKubernetes() { .then((response) => response.body) .catch((error) => { logger.error("Error getting ingresses: %d %s %s", error.statusCode, error.body, error.response); - logger.debug(error); + if (error) logger.debug(error); return null; }); @@ -232,7 +232,7 @@ export async function servicesFromKubernetes() { error.body, error.response, ); - logger.debug(error); + if (error) logger.debug(error); } return []; @@ -249,7 +249,7 @@ export async function servicesFromKubernetes() { error.body, error.response, ); - logger.debug(error); + if (error) logger.debug(error); } return []; @@ -319,7 +319,7 @@ export async function servicesFromKubernetes() { constructedService = JSON.parse(substituteEnvironmentVars(JSON.stringify(constructedService))); } catch (e) { logger.error("Error attempting k8s environment variable substitution."); - logger.debug(e); + if (e) logger.debug(e); } return constructedService; @@ -703,7 +703,7 @@ export function findGroupByName(groups, name) { } else if (group.groups) { const foundGroup = findGroupByName(group.groups, name); if (foundGroup) { - foundGroup.parent = group; + foundGroup.parent = group.name; return foundGroup; } }