github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #65831 from sttts/sttts-apiserver-simplify-insecure-loopback

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

kube-apiserver: drop unused loopback token in insecure mode

The token was not used. Removing the dead code.
This commit is contained in:
Kubernetes Submit Queue 2018-07-05 07:18:55 -07:00 committed by GitHub
commit 80c4097891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubeapiserver/options/BUILD
View File

@ -70,7 +70,6 @@ go_library(
"//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library",
"//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/pborman/uuid:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library",
], ],
) )

4
pkg/kubeapiserver/options/serving.go
View File

@ -22,7 +22,6 @@ import (
"net" "net"
"strconv" "strconv"
"github.com/pborman/uuid"
"github.com/spf13/pflag" "github.com/spf13/pflag"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
@ -130,8 +129,7 @@ func (s *InsecureServingOptions) ApplyTo(c *server.Config) (*kubeserver.Insecure
} }
var err error var err error
privilegedLoopbackToken := uuid.NewRandom().String() if c.LoopbackClientConfig, err = ret.NewLoopbackClientConfig(); err != nil {
if c.LoopbackClientConfig, err = ret.NewLoopbackClientConfig(privilegedLoopbackToken); err != nil {
return nil, err return nil, err
} }

2
pkg/kubeapiserver/server/insecure_handler.go
View File

@ -63,7 +63,7 @@ type InsecureServingInfo struct {
BindNetwork string BindNetwork string
} }
func (s *InsecureServingInfo) NewLoopbackClientConfig(token string) (*rest.Config, error) { func (s *InsecureServingInfo) NewLoopbackClientConfig() (*rest.Config, error) {
if s == nil { if s == nil {
return nil, nil return nil, nil
} }