From a6f5cf653e27b8a77c0de8eb760509f6c654c212 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Wed, 25 Apr 2018 18:51:38 -0400 Subject: [PATCH] restclient should not depend on api/core/v1 Kubernetes-commit: 847edc0e27054f1bf7771ba8d412b10bfd533f90 --- rest/config.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rest/config.go b/rest/config.go index 72a78bc0..af2cbb99 100644 --- a/rest/config.go +++ b/rest/config.go @@ -29,7 +29,6 @@ import ( "github.com/golang/glog" - "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -316,12 +315,12 @@ func InClusterConfig() (*Config, error) { return nil, fmt.Errorf("unable to load in-cluster configuration, KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT must be defined") } - token, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/" + v1.ServiceAccountTokenKey) + token, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/token") if err != nil { return nil, err } tlsClientConfig := TLSClientConfig{} - rootCAFile := "/var/run/secrets/kubernetes.io/serviceaccount/" + v1.ServiceAccountRootCAKey + rootCAFile := "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" if _, err := certutil.NewPool(rootCAFile); err != nil { glog.Errorf("Expected to load root CA config from %s, but got err: %v", rootCAFile, err) } else {