Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove untested and unused code #1660

Merged
merged 1 commit into from
Oct 13, 2014
Merged

Remove untested and unused code #1660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions cmd/proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
)

var (
configFile = flag.String("configfile", "/tmp/proxy_config", "Configuration file for the proxy")
etcdServerList util.StringList
etcdConfigFile = flag.String("etcd_config", "", "The config file for the etcd client. Mutually exclusive with -etcd_servers")
bindAddress = util.IP(net.ParseIP("0.0.0.0"))
Expand Down Expand Up @@ -97,12 +96,6 @@ func main() {
}
}

// And create a configuration source that reads from a local file
config.NewConfigSourceFile(*configFile,
serviceConfig.Channel("file"),
endpointsConfig.Channel("file"))
glog.Infof("Using configuration file %s", *configFile)

loadBalancer := proxy.NewLoadBalancerRR()
proxier := proxy.NewProxier(loadBalancer, net.IP(bindAddress))
// Wire proxier to handle changes to services
Expand Down
3 changes: 0 additions & 3 deletions docs/man/kube-proxy.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ The kube-proxy takes several options.
**-bindaddress**="0.0.0.0"
The address for the proxy server to serve on (set to 0.0.0.0 or "" for all interfaces)

**-configfile**="/tmp/proxy_config"
Configuration file for the proxy

**-etcd_servers**=[]
List of etcd servers to watch (http://ip:port), comma separated (optional)

Expand Down
4 changes: 0 additions & 4 deletions docs/man/man1/kube-proxy.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ The kube\-proxy takes several options.
\fB\-bindaddress\fP="0.0.0.0"
The address for the proxy server to serve on (set to 0.0.0.0 or "" for all interfaces)

.PP
\fB\-configfile\fP="/tmp/proxy\_config"
Configuration file for the proxy

.PP
\fB\-etcd\_servers\fP=[]
List of etcd servers to watch (
Expand Down
131 changes: 0 additions & 131 deletions pkg/proxy/config/file.go
View file
Open in desktop

This file was deleted.