Skip to content

fix: prefer KUBECONFIG over in-cluster config for k8s client #1012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sradco wants to merge 1 commit into
base: main-alerts-management-api
Choose a base branch
from
Open

fix: prefer KUBECONFIG over in-cluster config for k8s client #1012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions pkg/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/record"

"github.com/openshift/monitoring-plugin/internal/managementrouter"
Expand Down Expand Up @@ -127,18 +128,11 @@ func createHTTPServer(ctx context.Context, cfg *Config) (*http.Server, error) {
var k8sconfig *rest.Config
var err error

// Uncomment the following line for local development:
// k8sconfig, err = clientcmd.BuildConfigFromFlags("", os.Getenv("KUBECONFIG"))
// if err != nil {
// return nil, fmt.Errorf("cannot get kubeconfig from file: %w", err)
// }

// Comment the following line for local development:
var k8sclient *dynamic.DynamicClient
if acmMode || alertManagementAPIMode {
k8sconfig, err = rest.InClusterConfig()
k8sconfig, err = loadKubeConfig()
if err != nil {
return nil, fmt.Errorf("cannot get in cluster config: %w", err)
return nil, fmt.Errorf("cannot load kubernetes config: %w", err)
}

k8sclient, err = dynamic.NewForConfig(k8sconfig)
Expand Down Expand Up @@ -402,6 +396,23 @@ func configHandler(cfg *Config) (http.HandlerFunc, *PluginConfig) {
}), &pluginConfig
}

// loadKubeConfig returns a *rest.Config by preferring KUBECONFIG (useful for
// local development and CI) and falling back to in-cluster service-account config.
func loadKubeConfig() (*rest.Config, error) {
if kubeconfig := os.Getenv("KUBECONFIG"); kubeconfig != "" {
cfg, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
if err != nil {
return nil, fmt.Errorf("cannot build config from KUBECONFIG: %w", err)
}
return cfg, nil
}
cfg, err := rest.InClusterConfig()
if err != nil {
return nil, fmt.Errorf("cannot get in-cluster config: %w", err)
}
return cfg, nil
}

func startProxy(cfg *Config, k8sclient *dynamic.DynamicClient, tlsConfig *tls.Config, timeout time.Duration, kind proxy.KindType, port proxy.ProxyPort) {
proxyRouter := setupProxyRoutes(cfg, k8sclient, kind)
proxyRouter.Use(corsHeaderMiddleware())
Expand Down