github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77313 from bjhaid/cleanup_kube_proxy

Browse Source 
Clean up kube-proxy.
This commit is contained in:
Kubernetes Prow Robot 2019-05-10 21:30:12 -07:00 committed by GitHub
commit aabd8f9beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kube-proxy/app/BUILD
View File

@ -163,7 +163,6 @@ go_test(
], ],
embed = [":go_default_library"], embed = [":go_default_library"],
deps = [ deps = [
"//pkg/apis/core:go_default_library",
"//pkg/proxy/apis/config:go_default_library", "//pkg/proxy/apis/config:go_default_library",
"//pkg/util/configz:go_default_library", "//pkg/util/configz:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

4
cmd/kube-proxy/app/server.go
View File

@ -329,14 +329,12 @@ func (o *Options) runLoop() error {
}() }()
for { for {
select { err := <-o.errCh
case err := <-o.errCh:
if err != nil { if err != nil {
return err return err
} }
} }
} }
}
func (o *Options) writeConfigFile() (err error) { func (o *Options) writeConfigFile() (err error) {
const mediaType = runtime.ContentTypeYAML const mediaType = runtime.ContentTypeYAML

2
cmd/kube-proxy/app/server_others_test.go
View File

@ -29,8 +29,6 @@ import (
func Test_getProxyMode(t *testing.T) { func Test_getProxyMode(t *testing.T) {
var cases = []struct { var cases = []struct {
flag string flag string
annotationKey string
annotationVal string
iptablesVersion string iptablesVersion string
ipsetVersion string ipsetVersion string
kmods []string kmods []string

9
cmd/kube-proxy/app/server_test.go
View File

@ -33,20 +33,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
componentbaseconfig "k8s.io/component-base/config" componentbaseconfig "k8s.io/component-base/config"
api "k8s.io/kubernetes/pkg/apis/core"
kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"
"k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/util/configz"
utilpointer "k8s.io/utils/pointer" utilpointer "k8s.io/utils/pointer"
) )
type fakeNodeInterface struct {
node api.Node
}
func (fake *fakeNodeInterface) Get(hostname string, options metav1.GetOptions) (*api.Node, error) {
return &fake.node, nil
}
type fakeIPTablesVersioner struct { type fakeIPTablesVersioner struct {
version string // what to return version string // what to return
err error // what to return err error // what to return