From 5643b4e60c9a1feaebc0743e82760ab13a3f1a71 Mon Sep 17 00:00:00 2001 From: iwilltry42 Date: Fri, 12 Jun 2020 12:47:06 +0200 Subject: [PATCH] proxy: increase timeout to 10 minutes - prevent stream from breaking during e.g. 'kubectl get logs -f POD' Fixes #276 --- cmd/create/createNode.go | 2 +- pkg/types/types.go | 4 ++-- proxy/templates/nginx.tmpl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/create/createNode.go b/cmd/create/createNode.go index 8b49865b..db1d77c3 100644 --- a/cmd/create/createNode.go +++ b/cmd/create/createNode.go @@ -49,7 +49,7 @@ func NewCmdCreateNode() *cobra.Command { Run: func(cmd *cobra.Command, args []string) { nodes, cluster := parseCreateNodeCmd(cmd, args) if err := k3dc.AddNodesToCluster(cmd.Context(), runtimes.SelectedRuntime, nodes, cluster, createNodeOpts); err != nil { - log.Errorf("Failed to add nodes to cluster '%s'", nodes, cluster.Name) + log.Errorf("Failed to add nodes to cluster '%s'", cluster.Name) log.Errorln(err) } }, diff --git a/pkg/types/types.go b/pkg/types/types.go index 486fdbae..f569864b 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -39,12 +39,12 @@ const DefaultClusterNameMaxLength = 32 const DefaultK3sImageRepo = "docker.io/rancher/k3s" // DefaultLBImage defines the default cluster load balancer image -const DefaultLBImage = "docker.io/iwilltry42/k3d-proxy:v0.0.2" +const DefaultLBImage = "docker.io/iwilltry42/k3d-proxy:v0.0.3" // DefaultObjectNamePrefix defines the name prefix for every object created by k3d const DefaultObjectNamePrefix = "k3d" -// ReadyLogMessageMaster defines the log messages we wait for until a master node is considered ready +// ReadyLogMessageByRole defines the log messages we wait for until a master node is considered ready var ReadyLogMessageByRole = map[Role]string{ MasterRole: "Wrote kubeconfig", WorkerRole: "Successfully registered node", diff --git a/proxy/templates/nginx.tmpl b/proxy/templates/nginx.tmpl index bd2f7975..68fd9420 100644 --- a/proxy/templates/nginx.tmpl +++ b/proxy/templates/nginx.tmpl @@ -21,7 +21,7 @@ stream { server { listen {{ $port }}; proxy_pass master_nodes_{{ $port }}; - proxy_timeout 30; + proxy_timeout 600; proxy_connect_timeout 2s; } {{- end }}