From 3a92e5d3ab0c2bcd56cbd5037eb18f134668389a Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Tue, 21 Apr 2020 20:22:27 +0300 Subject: [PATCH] Check also beta.kubernetes.io/os selector for windows pod shell (#293) Signed-off-by: Jari Kolehmainen --- dashboard/client/api/endpoints/pods.api.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dashboard/client/api/endpoints/pods.api.ts b/dashboard/client/api/endpoints/pods.api.ts index aaf5a6715228..8025d611d1fd 100644 --- a/dashboard/client/api/endpoints/pods.api.ts +++ b/dashboard/client/api/endpoints/pods.api.ts @@ -414,9 +414,9 @@ export class Pod extends WorkloadKubeObject { getSelectedNodeOs() { if (!this.spec.nodeSelector) return - if (!this.spec.nodeSelector["kubernetes.io/os"]) return + if (!this.spec.nodeSelector["kubernetes.io/os"] && !this.spec.nodeSelector["beta.kubernetes.io/os"]) return - return this.spec.nodeSelector["kubernetes.io/os"] + return this.spec.nodeSelector["kubernetes.io/os"] || this.spec.nodeSelector["beta.kubernetes.io/os"] } }