DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicated BuildConfigFromFlags func (#2162)

Browse source 
Use BuildConfigFromFlags from k8s.io/client-go/tools/clientcmd instead
of local copy.
This commit is contained in:
Antoine Cotten 2018-03-01 14:27:53 +01:00 committed by Manuel Alejandro de Brito Fontes
parent 8ddb610604
commit 01399dd625
1 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmd/nginx/main.go
View file

@ -36,9 +36,7 @@ import (
discovery "k8s.io/apimachinery/pkg/version" discovery "k8s.io/apimachinery/pkg/version"
"k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/healthz"
"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"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/ingress-nginx/internal/file" "k8s.io/ingress-nginx/internal/file"
"k8s.io/ingress-nginx/internal/ingress/controller" "k8s.io/ingress-nginx/internal/ingress/controller"
@ -171,7 +169,7 @@ func handleSigterm(ngx *controller.NGINXController, exit exiter) {
// apiserverHost param is in the format of protocol://address:port/pathPrefix, e.g.http://localhost:8001. // apiserverHost param is in the format of protocol://address:port/pathPrefix, e.g.http://localhost:8001.
// kubeConfig location of kubeconfig file // kubeConfig location of kubeconfig file
func createApiserverClient(apiserverHost string, kubeConfig string) (*kubernetes.Clientset, error) { func createApiserverClient(apiserverHost string, kubeConfig string) (*kubernetes.Clientset, error) {
cfg, err := buildConfigFromFlags(apiserverHost, kubeConfig) cfg, err := clientcmd.BuildConfigFromFlags(apiserverHost, kubeConfig)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -241,27 +239,6 @@ const (
fakeCertificate = "default-fake-certificate" fakeCertificate = "default-fake-certificate"
) )
// buildConfigFromFlags builds REST config based on master URL and kubeconfig path.
// If both of them are empty then in cluster config is used.
func buildConfigFromFlags(masterURL, kubeconfigPath string) (*rest.Config, error) {
if kubeconfigPath == "" && masterURL == "" {
kubeconfig, err := rest.InClusterConfig()
if err != nil {
return nil, err
}
return kubeconfig, nil
}
return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfigPath},
&clientcmd.ConfigOverrides{
ClusterInfo: clientcmdapi.Cluster{
Server: masterURL,
},
}).ClientConfig()
}
/** /**
* Handles fatal init error that prevents server from doing any work. Prints verbose error * Handles fatal init error that prevents server from doing any work. Prints verbose error
* message and quits the server. * message and quits the server.