818f357128
Convert host:port and URLs passed to client.New() into the proper values, and return an error if the value is invalid. Change CLI to return an error if -master is invalid. Remove Client.rawRequest which was not in use, and fix the involved tests. Add NewOrDie Preserves the behavior of the client to not auth when a non-https URL is passed (although in the future this should be corrected).
96 lines
2.8 KiB
Go
96 lines
2.8 KiB
Go
/*
|
|
Copyright 2014 Google Inc. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package main
|
|
|
|
import (
|
|
"flag"
|
|
"time"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/proxy"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/proxy/config"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
|
verflag "github.com/GoogleCloudPlatform/kubernetes/pkg/version/flag"
|
|
"github.com/coreos/go-etcd/etcd"
|
|
"github.com/golang/glog"
|
|
)
|
|
|
|
var (
|
|
configFile = flag.String("configfile", "/tmp/proxy_config", "Configuration file for the proxy")
|
|
master = flag.String("master", "", "The address of the Kubernetes API server (optional)")
|
|
etcdServerList util.StringList
|
|
)
|
|
|
|
func init() {
|
|
flag.Var(&etcdServerList, "etcd_servers", "List of etcd servers to watch (http://ip:port), comma separated (optional)")
|
|
}
|
|
|
|
func main() {
|
|
flag.Parse()
|
|
util.InitLogs()
|
|
defer util.FlushLogs()
|
|
|
|
verflag.PrintAndExitIfRequested()
|
|
|
|
serviceConfig := config.NewServiceConfig()
|
|
endpointsConfig := config.NewEndpointsConfig()
|
|
|
|
// define api config source
|
|
if *master != "" {
|
|
glog.Infof("Using api calls to get config %v", *master)
|
|
//TODO: add auth info
|
|
client, err := client.New(*master, nil)
|
|
if err != nil {
|
|
glog.Fatalf("Invalid -master: %v", err)
|
|
}
|
|
config.NewSourceAPI(
|
|
client,
|
|
30*time.Second,
|
|
serviceConfig.Channel("api"),
|
|
endpointsConfig.Channel("api"),
|
|
)
|
|
}
|
|
|
|
// Create a configuration source that handles configuration from etcd.
|
|
if len(etcdServerList) > 0 && *master == "" {
|
|
glog.Infof("Using etcd servers %v", etcdServerList)
|
|
|
|
// Set up logger for etcd client
|
|
etcd.SetLogger(util.NewLogger("etcd "))
|
|
etcdClient := etcd.NewClient(etcdServerList)
|
|
config.NewConfigSourceEtcd(etcdClient,
|
|
serviceConfig.Channel("etcd"),
|
|
endpointsConfig.Channel("etcd"))
|
|
}
|
|
|
|
// 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)
|
|
// Wire proxier to handle changes to services
|
|
serviceConfig.RegisterHandler(proxier)
|
|
// And wire loadBalancer to handle changes to endpoints to services
|
|
endpointsConfig.RegisterHandler(loadBalancer)
|
|
|
|
// Just loop forever for now...
|
|
select {}
|
|
}
|