createCluster: wait for 'k3s is up and running' instead of 'Running kubelet' to ensure that the API-Server is up

This commit is contained in:
iwilltry42 2020-10-08 20:58:20 +02:00
parent ca23c6d898
commit 584bf71592
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
2 changed files with 2 additions and 2 deletions

View File

@ -214,7 +214,7 @@ func ClusterCreate(ctx context.Context, runtime k3drt.Runtime, cluster *k3d.Clus
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
nRead, _ := buf.ReadFrom(logreader) nRead, _ := buf.ReadFrom(logreader)
logreader.Close() logreader.Close()
if nRead > 0 && strings.Contains(buf.String(), "Running kubelet") { if nRead > 0 && strings.Contains(buf.String(), k3d.ReadyLogMessageByRole[k3d.ServerRole]) {
log.Debugln("Initializing server node is up... continuing") log.Debugln("Initializing server node is up... continuing")
break break
} }

View File

@ -49,7 +49,7 @@ const DefaultObjectNamePrefix = "k3d"
// ReadyLogMessageByRole defines the log messages we wait for until a server node is considered ready // ReadyLogMessageByRole defines the log messages we wait for until a server node is considered ready
var ReadyLogMessageByRole = map[Role]string{ var ReadyLogMessageByRole = map[Role]string{
ServerRole: "Wrote kubeconfig", ServerRole: "k3s is up and running",
AgentRole: "Successfully registered node", AgentRole: "Successfully registered node",
LoadBalancerRole: "start worker processes", LoadBalancerRole: "start worker processes",
} }