Commit 6b6617e6 authored by Geoff Simmons's avatar Geoff Simmons

Use in-cluster config directly when config flags are not set.

Eliminates a warning message at startup.
parent 4ee9467e
...@@ -48,6 +48,7 @@ import ( ...@@ -48,6 +48,7 @@ import (
api_v1 "k8s.io/api/core/v1" api_v1 "k8s.io/api/core/v1"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
) )
...@@ -245,9 +246,16 @@ func main() { ...@@ -245,9 +246,16 @@ func main() {
os.Exit(-1) os.Exit(-1)
} }
config, err := clientcmd.BuildConfigFromFlags(*masterURLF, *kubeconfigF) var config *rest.Config
if err != nil { if *masterURLF == "" && *kubeconfigF == "" {
log.Fatalf("error creating client configuration: %v", err) if config, err = rest.InClusterConfig(); err != nil {
log.Fatalf("error creating in-cluster config: %v", err)
}
} else if config, err = clientcmd.BuildConfigFromFlags(*masterURLF,
*kubeconfigF); err != nil {
log.Fatalf("error creating client config from "+
"masterURL=%s and kubeconfig=%s: %v",
*masterURLF, *kubeconfigF, err)
} }
kubeClient, err := kubernetes.NewForConfig(config) kubeClient, err := kubernetes.NewForConfig(config)
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment