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

Merge pull request #85642 from claudiubelu/tests/guestbook-workers-update-image

Browse Source 
test images: Updates agnhost guestbook subcommand
This commit is contained in:
Kubernetes Prow Robot 2020-03-03 15:33:47 -08:00 committed by GitHub
commit 25d241eda2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/images/agnhost/guestbook/guestbook.go
View File

@ -83,9 +83,11 @@ func registerNode(registerTo, port string) {
return return
} }
request := fmt.Sprintf("register?host=%s", getIP(hostPort).String())
log.Printf("Registering to master: %s/%s", hostPort, request)
start := time.Now() start := time.Now()
for time.Since(start) < timeout { for time.Since(start) < timeout {
response, err := dialHTTP("register", hostPort) response, err := dialHTTP(request, hostPort)
if err != nil { if err != nil {
log.Printf("encountered error while registering to master: %v. Retrying in 1 second.", err) log.Printf("encountered error while registering to master: %v. Retrying in 1 second.", err)
time.Sleep(sleep) time.Sleep(sleep)
@ -121,12 +123,14 @@ func startHTTPServer(port string) {
// registerHandler will register the caller in this server's list of slaves. // registerHandler will register the caller in this server's list of slaves.
// /set requests will be propagated to slaves, if any. // /set requests will be propagated to slaves, if any.
func registerHandler(w http.ResponseWriter, r *http.Request) { func registerHandler(w http.ResponseWriter, r *http.Request) {
ip, _, err := net.SplitHostPort(r.RemoteAddr) values, err := url.Parse(r.URL.RequestURI())
if err != nil { if err != nil {
fmt.Fprintf(w, "userip: %q is not IP:port", r.RemoteAddr) http.Error(w, fmt.Sprintf("%v", err), http.StatusBadRequest)
return return
} }
log.Printf("GET /register, IP: %s", ip)
ip := values.Query().Get("host")
log.Printf("GET /register?host=%s", ip)
// send all the store to the slave as well. // send all the store to the slave as well.
output := make(map[string]interface{}) output := make(map[string]interface{})
@ -280,3 +284,14 @@ func createHTTPClient(transport *http.Transport) *http.Client {
} }
return client return client
} }
func getIP(hostPort string) net.IP {
conn, err := net.Dial("udp", hostPort)
if err != nil {
log.Fatal(err)
}
defer conn.Close()
localAddr := conn.LocalAddr().(*net.UDPAddr)
return localAddr.IP
}