Improved handling of empty or disabled kubernetes configuration

gethomepage · Nov 6, 2022 · 056e26d · 056e26d
1 parent 0c6f7db
commit 056e26d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/src/pages/api/kubernetes/stats/[...service].js b/src/pages/api/kubernetes/stats/[...service].js
@@ -21,6 +21,12 @@ export default async function handler(req, res) {
 
  try {
  const kc = getKubeConfig();
+ if (!kc) {
+ res.status(500).send({
+ error: "No kubernetes configuration"
+ });
+ return;
+ }
  const coreApi = kc.makeApiClient(CoreV1Api);
  const metricsApi = new Metrics(kc);
  const podsResponse = await coreApi.listNamespacedPod(namespace, null, null, null, null, labelSelector)

diff --git a/src/pages/api/kubernetes/status/[...service].js b/src/pages/api/kubernetes/status/[...service].js
@@ -20,6 +20,12 @@ export default async function handler(req, res) {
 
  try {
  const kc = getKubeConfig();
+ if (!kc) {
+ res.status(500).send({
+ error: "No kubernetes configuration"
+ });
+ return;
+ }
  const coreApi = kc.makeApiClient(CoreV1Api);
  const podsResponse = await coreApi.listNamespacedPod(namespace, null, null, null, null, labelSelector)
  .then((response) => response.body)

diff --git a/src/pages/api/widgets/kubernetes.js b/src/pages/api/widgets/kubernetes.js
@@ -11,6 +11,11 @@ export default async function handler(req, res) {
 
  try {
  const kc = getKubeConfig();
+ if (!kc) {
+ return res.status(500).send({
+ error: "No kubernetes configuration"
+ });
+ }
  const coreApi = kc.makeApiClient(CoreV1Api);
  const metricsApi = new Metrics(kc);
 

diff --git a/src/utils/config/kubernetes.js b/src/utils/config/kubernetes.js
@@ -19,8 +19,11 @@ export default function getKubeConfig() {
  kc.loadFromCluster();
  break;
  case 'default':
- default:
  kc.loadFromDefault();
+ break;
+ case 'disabled':
+ default:
+ return null;
  }
 
  return kc;

diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
@@ -125,6 +125,9 @@ export async function servicesFromKubernetes() {
 
  try {
  const kc = getKubeConfig();
+ if (!kc) {
+ return [];
+ }
  const networking = kc.makeApiClient(NetworkingV1Api);
 
  const ingressList = await networking.listIngressForAllNamespaces(null, null, null, "homepage/enabled=true")