Skip to content

Commit

Permalink
fix: use default client config loading rules to make KUBECONFIG parse…
Browse files Browse the repository at this point in the history
… correctly.
  • Loading branch information
atombender committed Oct 3, 2022
1 parent 6536af1 commit 5090beb
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,6 @@ func main() {
includePatterns = append(includePatterns, r)
}

if kubeconfigPath == "" {
if os.Getenv("KUBECONFIG") != "" {
kubeconfigPath = os.Getenv("KUBECONFIG")
} else {
kubeconfigPath = clientcmd.RecommendedHomeFile
}
}

labelSelector := labels.Everything()
if labelSelectorExpr != "" {
if sel, err := labels.Parse(labelSelectorExpr); err != nil {
Expand All @@ -122,10 +114,16 @@ func main() {
inclusionMatcher := buildMatcher(includePatterns, labelSelector, true)
exclusionMatcher := buildMatcher(excludePatterns, nil, false)

clientConfig := clientcmd.NewInteractiveDeferredLoadingClientConfig(
&clientcmd.ClientConfigLoadingRules{
var loadingRules *clientcmd.ClientConfigLoadingRules
if kubeconfigPath != "" {
loadingRules = &clientcmd.ClientConfigLoadingRules{
ExplicitPath: kubeconfigPath,
},
}
} else {
loadingRules = clientcmd.NewDefaultClientConfigLoadingRules()
}

clientConfig := clientcmd.NewInteractiveDeferredLoadingClientConfig(loadingRules,
&clientcmd.ConfigOverrides{
CurrentContext: contextName,
},
Expand Down

0 comments on commit 5090beb

Please sign in to comment.