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

Merge pull request #4254 from smarterclayton/integration_tests_should_use_127001

Browse Source 
Integration tests should use 127.0.0.1 consistently
This commit is contained in:
Tim Hockin 2015-02-09 14:36:04 -08:00
commit 488bf23034
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/integration/integration.go
View File

@ -82,7 +82,7 @@ func (fakeKubeletClient) GetPodStatus(host, podNamespace, podID string) (api.Pod
default: default:
glog.Fatalf("Can't get info for: '%v', '%v - %v'", host, podNamespace, podID) glog.Fatalf("Can't get info for: '%v', '%v - %v'", host, podNamespace, podID)
} }
r, err := c.GetPodStatus("localhost", podNamespace, podID) r, err := c.GetPodStatus("127.0.0.1", podNamespace, podID)
if err != nil { if err != nil {
return r, err return r, err
} }
@ -114,7 +114,7 @@ func (h *delegateHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
func startComponents(manifestURL string) (apiServerURL string) { func startComponents(manifestURL string) (apiServerURL string) {
// Setup // Setup
servers := []string{"http://localhost:4001"} servers := []string{}
glog.Infof("Creating etcd client pointing to %v", servers) glog.Infof("Creating etcd client pointing to %v", servers)
machineList := []string{"localhost", "127.0.0.1"} machineList := []string{"localhost", "127.0.0.1"}
@ -163,6 +163,11 @@ func startComponents(manifestURL string) (apiServerURL string) {
glog.Fatalf("Nonnumeric port? %v", err) glog.Fatalf("Nonnumeric port? %v", err)
} }
publicAddress := net.ParseIP(host)
if publicAddress == nil {
glog.Fatalf("no public address for %s", host)
}
// Create a master and install handlers into mux. // Create a master and install handlers into mux.
m := master.New(&master.Config{ m := master.New(&master.Config{
Client: cl, Client: cl,
@ -174,7 +179,7 @@ func startComponents(manifestURL string) (apiServerURL string) {
AdmissionControl: admit.NewAlwaysAdmit(), AdmissionControl: admit.NewAlwaysAdmit(),
ReadWritePort: portNumber, ReadWritePort: portNumber,
ReadOnlyPort: portNumber, ReadOnlyPort: portNumber,
PublicAddress: net.ParseIP(host), PublicAddress: publicAddress,
CacheTimeout: 2 * time.Second, CacheTimeout: 2 * time.Second,
}) })
handler.delegate = m.Handler handler.delegate = m.Handler

6
hack/lib/etcd.sh
View File

@ -40,12 +40,12 @@ kube::etcd::start() {
# Start etcd # Start etcd
ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX) ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
kube::log::usage "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null" kube::log::usage "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null"
etcd -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null & etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null &
ETCD_PID=$! ETCD_PID=$!
echo "Waiting for etcd to come up." echo "Waiting for etcd to come up."
kube::util::wait_for_url "http://${testhost}:${port}/v2/machines" "etcd: " 0.25 80 kube::util::wait_for_url "http://${host}:${port}/v2/machines" "etcd: " 0.25 80
curl -X PUT "http://${testhost}:${port}/v2/keys/_test" curl -X PUT "http://${host}:${port}/v2/keys/_test"
} }
kube::etcd::cleanup() { kube::etcd::cleanup() {

2
hack/local-up-cluster.sh
View File

@ -93,7 +93,7 @@ sudo "${GO_OUT}/kube-apiserver" \
--address="${API_HOST}" \ --address="${API_HOST}" \
--port="${API_PORT}" \ --port="${API_PORT}" \
--runtime_config=api/v1beta3 \ --runtime_config=api/v1beta3 \
--etcd_servers="http://localhost:4001" \ --etcd_servers="http://127.0.0.1:4001" \
--portal_net="10.0.0.0/24" \ --portal_net="10.0.0.0/24" \
--cors_allowed_origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 & --cors_allowed_origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &
APISERVER_PID=$! APISERVER_PID=$!