From 09db5d94e17945579c35aad28636dc0ab6e773e6 Mon Sep 17 00:00:00 2001 From: Ben Hirschberg Date: Mon, 24 Jan 2022 16:47:12 +0200 Subject: [PATCH] Fixing null pointer exception in case of in-cluster installation --- resourcehandler/gkesupport.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/resourcehandler/gkesupport.go b/resourcehandler/gkesupport.go index e6f2eeef..9ed961e1 100644 --- a/resourcehandler/gkesupport.go +++ b/resourcehandler/gkesupport.go @@ -71,7 +71,11 @@ func NewGKEProviderContext() *GKEProviderContext { } func (gkeProviderContext *GKEProviderContext) getKubeClusterName() string { - cluster := k8sinterface.GetCurrentContext().Cluster + context := k8sinterface.GetCurrentContext() + if context == nil { + return "" + } + cluster := context.Cluster parsedName := strings.Split(cluster, "_") if len(parsedName) < 3 { return "" @@ -90,7 +94,11 @@ func (gkeProviderContext *GKEProviderContext) getKubeClusterName() string { } func (gkeProviderContext *GKEProviderContext) getKubeCluster() string { - cluster := k8sinterface.GetCurrentContext().Cluster + context := k8sinterface.GetCurrentContext() + if context == nil { + return "" + } + cluster := context.Cluster if cluster != "" { return cluster }