github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #426 from galal-hussein/check_hostname 

Check if hostname is resolvable before running agent
pull/429/head
Darren Shepherd 2019-05-02 10:45:09 -07:00 committed by GitHub
parent 068c7dfb8a 7e1699cda0
commit 93e9f50395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/agent/config/config.go
View File

@ -253,6 +253,8 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
return nil, err return nil, err
} }
hostnameCheck(nodeName)
nodeCertFile := filepath.Join(envInfo.DataDir, "token-node.crt") nodeCertFile := filepath.Join(envInfo.DataDir, "token-node.crt")
nodeKeyFile := filepath.Join(envInfo.DataDir, "token-node.key") nodeKeyFile := filepath.Join(envInfo.DataDir, "token-node.key")
nodePasswordFile := filepath.Join(envInfo.DataDir, "node-password.txt") nodePasswordFile := filepath.Join(envInfo.DataDir, "node-password.txt")
@ -348,3 +350,14 @@ func getConfig(info *clientaccess.Info) (*config.Control, error) {
controlControl := &config.Control{} controlControl := &config.Control{}
return controlControl, json.Unmarshal(data, controlControl) return controlControl, json.Unmarshal(data, controlControl)
} }
func hostnameCheck(hostname string) {
for {
_, err := sysnet.LookupHost(hostname)
if err == nil {
break
}
logrus.Infof("Waiting for hostname %s to be resolvable: %v", hostname, err)
time.Sleep(2 * time.Second)
}
}