From d258ff803404369dd848e7e1164e937fa1333444 Mon Sep 17 00:00:00 2001 From: Vladyslav Palyvoda Date: Fri, 19 Jul 2024 16:55:13 +0300 Subject: [PATCH] fix: Fix issues (#302) --- Dockerfile | 2 +- src/k8s/TaskRun/index.ts | 4 ++-- .../edp-configuration/pages/edp-sso-integration/view.tsx | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index da4fabe1..8f00cbfb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM epamedp/headlamp:0.22.22 +FROM epamedp/headlamp:0.22.23 COPY --chown=100:101 assets/ /headlamp/frontend COPY --chown=100:101 dist/main.js /headlamp/plugins/edp/main.js diff --git a/src/k8s/TaskRun/index.ts b/src/k8s/TaskRun/index.ts index 3a141424..54b5a28a 100644 --- a/src/k8s/TaskRun/index.ts +++ b/src/k8s/TaskRun/index.ts @@ -89,11 +89,11 @@ export class TaskRunKubeObject extends K8s.cluster.makeKubeObject, reason: ValueOf ): [string, string, boolean?] { - if (status === undefined || reason === undefined) { + if (status === undefined) { return [ICONS.UNKNOWN, STATUS_COLOR.UNKNOWN]; } const _status = status.toLowerCase(); - const _reason = reason.toLowerCase(); + const _reason = reason && reason.toLowerCase(); switch (_status) { case TASK_RUN_STEP_STATUS.RUNNING: diff --git a/src/pages/edp-configuration/pages/edp-sso-integration/view.tsx b/src/pages/edp-configuration/pages/edp-sso-integration/view.tsx index d826bd30..8d802621 100644 --- a/src/pages/edp-configuration/pages/edp-sso-integration/view.tsx +++ b/src/pages/edp-configuration/pages/edp-sso-integration/view.tsx @@ -41,6 +41,10 @@ export const PageView = () => { () => ingresses ? ingresses.filter((ingress) => { + if (!ingress.metadata.annotations) { + return false; + } + return 'nginx.ingress.kubernetes.io/auth-url' in ingress.metadata.annotations; }) : null,