github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Make master service IP static (no longer randomly assigned)

Browse Source
This commit is contained in:
saadali
2015-01-19 19:25:06 -08:00
parent b40d079551
commit e83fd7b8e7
9 changed files with 144 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/integration/integration.go
View File

@@ -162,7 +162,7 @@ func startComponents(manifestURL string) (apiServerURL string) {
AdmissionControl: admit.NewAlwaysAdmit(),
ReadWritePort: portNumber,
ReadOnlyPort: portNumber,
PublicAddress: host,
PublicAddress: net.ParseIP(host),
})
handler.delegate = m.Handler

8
cmd/kubernetes/kubernetes.go
View File

@@ -22,6 +22,7 @@ package main
import (
"fmt"
"net"
kubeletapp "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@@ -46,7 +47,7 @@ var (
masterServiceNamespace = flag.String("master_service_namespace", api.NamespaceDefault, "The namespace from which the kubernetes master services should be injected into pods")
)
func startComponents(etcdClient tools.EtcdClient, cl *client.Client, addr string, port int) {
func startComponents(etcdClient tools.EtcdClient, cl *client.Client, addr net.IP, port int) {
machineList := []string{"localhost"}
standalone.RunApiServer(cl, etcdClient, addr, port, *masterServiceNamespace)
@@ -57,7 +58,7 @@ func startComponents(etcdClient tools.EtcdClient, cl *client.Client, addr string
standalone.SimpleRunKubelet(cl, nil, dockerClient, machineList[0], "/tmp/kubernetes", "", "127.0.0.1", 10250, *masterServiceNamespace, kubeletapp.ProbeVolumePlugins())
}
func newApiClient(addr string, port int) *client.Client {
func newApiClient(addr net.IP, port int) *client.Client {
apiServerURL := fmt.Sprintf("http://%s:%d", addr, port)
cl := client.NewOrDie(&client.Config{Host: apiServerURL, Version: testapi.Version()})
return cl
@@ -73,7 +74,8 @@ func main() {
if err != nil {
glog.Fatalf("Failed to connect to etcd: %v", err)
}
startComponents(etcdClient, newApiClient(*addr, *port), *addr, *port)
address := net.ParseIP(*addr)
startComponents(etcdClient, newApiClient(address, *port), address, *port)
glog.Infof("Kubernetes API Server is up and running on http://%s:%d", *addr, *port)
select {}