Support timeouts in Linkerd and nginx-ingress wizards (#130)

kubeshop · Aug 19, 2021 · 11d5684 · 11d5684
1 parent 4877aca
commit 11d5684
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/wizard/flow/linkerd.go b/wizard/flow/linkerd.go
@@ -2,6 +2,8 @@ package flow
 
 import (
 	"fmt"
+	"log"
+	"strconv"
 
 	"github.com/kubeshop/kusk/generators/linkerd"
 	"github.com/kubeshop/kusk/options"
@@ -21,6 +23,17 @@ func (l linkerdFlow) Start() (Response, error) {
 
 	basePath := l.prompt.SelectOneOf("Base path prefix", basePathSuggestions, true)
 
+	var timeoutOptions options.TimeoutOptions
+
+	// Support only request timeout as linkerd generator doesn't support idle timeout
+	if requestTimeout := l.prompt.Input("Request timeout, leave empty to skip", ""); requestTimeout != "" {
+		if rTimeout, err := strconv.Atoi(requestTimeout); err != nil {
+			log.Printf("WARN: %s is not a valid request timeout value. Skipping\n", requestTimeout)
+		} else {
+			timeoutOptions.RequestTimeout = uint32(rTimeout)
+		}
+	}
+
 	opts := &options.Options{
 		Namespace: l.targetNamespace,
 		Path: options.PathOptions{
@@ -33,6 +46,7 @@ func (l linkerdFlow) Start() (Response, error) {
 		Cluster: options.ClusterOptions{
 			ClusterDomain: clusterDomain,
 		},
+		Timeouts: timeoutOptions,
 	}
 
 	cmd := fmt.Sprintf("kusk linkerd -i %s ", l.apiSpecPath)
@@ -42,6 +56,10 @@ func (l linkerdFlow) Start() (Response, error) {
 	cmd = cmd + fmt.Sprintf("--path.base=%s ", basePath)
 	cmd = cmd + fmt.Sprintf("--cluster.cluster_domain=%s ", clusterDomain)
 
+	if timeoutOptions.RequestTimeout > 0 {
+		cmd = cmd + fmt.Sprintf("--timeouts.request_timeout=%d", timeoutOptions.RequestTimeout)
+	}
+
 	var ld linkerd.Generator
 
 	serviceProfiles, err := ld.Generate(opts, l.apiSpec)

diff --git a/wizard/flow/nginx_ingress.go b/wizard/flow/nginx_ingress.go
@@ -2,6 +2,8 @@ package flow
 
 import (
 	"fmt"
+	"log"
+	"strconv"
 	"strings"
 
 	"github.com/kubeshop/kusk/generators/nginx_ingress"
@@ -26,6 +28,17 @@ func (n nginxIngressFlow) Start() (Response, error) {
 		separateMappings = n.prompt.Confirm("Generate ingress resource for each endpoint separately?")
 	}
 
+	var timeoutOptions options.TimeoutOptions
+
+	// Support only request timeout as nginx-ingress generator doesn't support idle timeout
+	if requestTimeout := n.prompt.Input("Request timeout, leave empty to skip", ""); requestTimeout != "" {
+		if rTimeout, err := strconv.Atoi(requestTimeout); err != nil {
+			log.Printf("WARN: %s is not a valid request timeout value. Skipping\n", requestTimeout)
+		} else {
+			timeoutOptions.RequestTimeout = uint32(rTimeout)
+		}
+	}
+
 	opts := &options.Options{
 		Namespace: n.targetNamespace,
 		Service: options.ServiceOptions{
@@ -37,6 +50,7 @@ func (n nginxIngressFlow) Start() (Response, error) {
 			TrimPrefix: trimPrefix,
 			Split:      separateMappings,
 		},
+		Timeouts: timeoutOptions,
 	}
 
 	var sb strings.Builder