Merge pull request #14 from beejiujitsu/master

fix: broader error checking for deployments_triage
emirozer · Feb 14, 2022 · c8dda0f · c8dda0f
2 parents 8f5e83a + b25c865
commit c8dda0f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -56,11 +56,14 @@ func InitClient() *kubernetes.Clientset {
 
 	flag.Parse()
 
-	config = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+	config, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
                 &clientcmd.ClientConfigLoadingRules{ExplicitPath: *kubeconfig},
                 &clientcmd.ConfigOverrides{
-                        CurrentContext: *context,
+                        CurrentContext: *kubecontext,
                 }).ClientConfig()
+	if err != nil {
+		panic(err.Error())
+	}
 
 	csBackup, err := getClientSetFromConfig(config)
 	if err != nil {

diff --git a/pkg/triage/deployments_triage.go b/pkg/triage/deployments_triage.go
@@ -1,6 +1,7 @@
 package triage
 
 import (
+	"strings"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
@@ -12,7 +13,7 @@ func OrphanedDeployments(kubeCli *kubernetes.Clientset, namespace string) (*Tria
 	listOfTriages := make([]string, 0)
 	deployments, err := kubeCli.ExtensionsV1beta1().Deployments(namespace).List(v1.ListOptions{})
 	if err != nil {
-		if err.Error() != KUBE_RESOURCE_NOT_FOUND {
+		if ! strings.Contains(err.Error(), KUBE_RESOURCE_NOT_FOUND) {
 			return nil, err
 		}
 	}
@@ -31,7 +32,7 @@ func LeftOverDeployments(kubeCli *kubernetes.Clientset, namespace string) (*Tria
 	listOfTriages := make([]string, 0)
 	deployments, err := kubeCli.ExtensionsV1beta1().Deployments(namespace).List(v1.ListOptions{})
 	if err != nil {
-		if err.Error() != KUBE_RESOURCE_NOT_FOUND {
+		if ! strings.Contains(err.Error(), KUBE_RESOURCE_NOT_FOUND) {
 			return nil, err
 		}
 	}