mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

proxy: increase timeout to 10 minutes

Browse Source 
- prevent stream from breaking during e.g. 'kubectl get logs -f POD'

Fixes #276
This commit is contained in:
iwilltry42 2020-06-12 12:47:06 +02:00
parent 2d0ec0a1d0
commit 5643b4e60c
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/create/createNode.go
View File

@ -49,7 +49,7 @@ func NewCmdCreateNode() *cobra.Command {
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
nodes, cluster := parseCreateNodeCmd(cmd, args) nodes, cluster := parseCreateNodeCmd(cmd, args)
if err := k3dc.AddNodesToCluster(cmd.Context(), runtimes.SelectedRuntime, nodes, cluster, createNodeOpts); err != nil { 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) log.Errorln(err)
} }
}, },

4
pkg/types/types.go
View File

@ -39,12 +39,12 @@ const DefaultClusterNameMaxLength = 32
const DefaultK3sImageRepo = "docker.io/rancher/k3s" const DefaultK3sImageRepo = "docker.io/rancher/k3s"
// DefaultLBImage defines the default cluster load balancer image // 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 // DefaultObjectNamePrefix defines the name prefix for every object created by k3d
const DefaultObjectNamePrefix = "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{ var ReadyLogMessageByRole = map[Role]string{
MasterRole: "Wrote kubeconfig", MasterRole: "Wrote kubeconfig",
WorkerRole: "Successfully registered node", WorkerRole: "Successfully registered node",

2
proxy/templates/nginx.tmpl
View File

@ -21,7 +21,7 @@ stream {
server { server {
listen {{ $port }}; listen {{ $port }};
proxy_pass master_nodes_{{ $port }}; proxy_pass master_nodes_{{ $port }};
proxy_timeout 30; proxy_timeout 600;
proxy_connect_timeout 2s; proxy_connect_timeout 2s;
} }
{{- end }} {{- end }}