From 559b16360da28c73899123bf6026ce7d7a2e6d1a Mon Sep 17 00:00:00 2001 From: Eemeli Kantola Date: Thu, 16 Jun 2022 12:37:29 +0300 Subject: [PATCH 1/2] Allow configuring kubectl --request-timeout via env For example, ``` KUBECTL_DEFAULT_REQUEST_TIMEOUT=30 krane deploy ... ``` --- lib/krane/kubectl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/krane/kubectl.rb b/lib/krane/kubectl.rb index 679488136..b00b35bd8 100644 --- a/lib/krane/kubectl.rb +++ b/lib/krane/kubectl.rb @@ -9,7 +9,7 @@ class Kubectl empty: /\A\z/, context_deadline: /context deadline exceeded/, } - DEFAULT_TIMEOUT = 15 + DEFAULT_TIMEOUT = (ENV["KUBECTL_DEFAULT_REQUEST_TIMEOUT"] || 15).to_i MAX_RETRY_DELAY = 16 SERVER_DRY_RUN_MIN_VERSION = "1.13" From b81c43152fa521edcae6440276e5f7e67f9d3d5a Mon Sep 17 00:00:00 2001 From: Eemeli Kantola Date: Fri, 17 Jun 2022 11:14:18 +0300 Subject: [PATCH 2/2] Handle garbage KUBECTL_DEFAULT_REQUEST_TIMEOUT in a saner way --- lib/krane/kubectl.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/krane/kubectl.rb b/lib/krane/kubectl.rb index b00b35bd8..fd44642f5 100644 --- a/lib/krane/kubectl.rb +++ b/lib/krane/kubectl.rb @@ -9,7 +9,8 @@ class Kubectl empty: /\A\z/, context_deadline: /context deadline exceeded/, } - DEFAULT_TIMEOUT = (ENV["KUBECTL_DEFAULT_REQUEST_TIMEOUT"] || 15).to_i + ENV_DEFAULT_TIMEOUT = ENV["KUBECTL_DEFAULT_REQUEST_TIMEOUT"] + DEFAULT_TIMEOUT = (ENV_DEFAULT_TIMEOUT if Integer(ENV_DEFAULT_TIMEOUT) rescue 15).to_i MAX_RETRY_DELAY = 16 SERVER_DRY_RUN_MIN_VERSION = "1.13"