From 584bf7159279b71f45d0c477ee70b09d2cbd8890 Mon Sep 17 00:00:00 2001 From: iwilltry42 Date: Thu, 8 Oct 2020 20:58:20 +0200 Subject: [PATCH] createCluster: wait for 'k3s is up and running' instead of 'Running kubelet' to ensure that the API-Server is up --- pkg/cluster/cluster.go | 2 +- pkg/types/types.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 8c658c91..340ec3ae 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -214,7 +214,7 @@ func ClusterCreate(ctx context.Context, runtime k3drt.Runtime, cluster *k3d.Clus buf := new(bytes.Buffer) nRead, _ := buf.ReadFrom(logreader) 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") break } diff --git a/pkg/types/types.go b/pkg/types/types.go index f64f57a0..9ca281a6 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -49,7 +49,7 @@ const DefaultObjectNamePrefix = "k3d" // ReadyLogMessageByRole defines the log messages we wait for until a server node is considered ready var ReadyLogMessageByRole = map[Role]string{ - ServerRole: "Wrote kubeconfig", + ServerRole: "k3s is up and running", AgentRole: "Successfully registered node", LoadBalancerRole: "start worker processes", }