From efd35c5291fc91391d8c8ef8065def2dbfd73b95 Mon Sep 17 00:00:00 2001 From: Rene Scheepers Date: Wed, 13 Jul 2022 14:18:00 +0200 Subject: [PATCH] fix: remove some debugging code from the branch --- lib/krane/kubectl.rb | 9 ++------- lib/krane/kubernetes_resource/custom_resource.rb | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/krane/kubectl.rb b/lib/krane/kubectl.rb index aa1909a14..679488136 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 = 30 + DEFAULT_TIMEOUT = 15 MAX_RETRY_DELAY = 16 SERVER_DRY_RUN_MIN_VERSION = "1.13" @@ -35,7 +35,6 @@ def run(*args, log_failure: nil, use_context: true, use_namespace: true, output: (1..attempts).to_a.each do |current_attempt| logger.debug("Running command (attempt #{current_attempt}): #{cmd.join(' ')}") - cmd_string = cmd.join(' ') env = { 'KUBECONFIG' => kubeconfig } out, err, st = Open3.capture3(env, *cmd) @@ -44,13 +43,9 @@ def run(*args, log_failure: nil, use_context: true, use_namespace: true, output: out = out.dup.force_encoding(Encoding::UTF_8) end - if cmd_string.include?("kubectl get Deploy") - # logger.debug(out) - end - if logger.debug? && !output_is_sensitive # don't do the gsub unless we're going to print this - # logger.debug("Kubectl out: " + out.gsub(/\s+/, ' ')) + logger.debug("Kubectl out: " + out.gsub(/\s+/, ' ')) end break if st.success? diff --git a/lib/krane/kubernetes_resource/custom_resource.rb b/lib/krane/kubernetes_resource/custom_resource.rb index 90240111c..422656d44 100644 --- a/lib/krane/kubernetes_resource/custom_resource.rb +++ b/lib/krane/kubernetes_resource/custom_resource.rb @@ -81,7 +81,7 @@ def kind end def group - definition["apiVersion"].include?("/") ? definition["apiVersion"].split("/").first : "" + Krane.group_from_api_version(definition["apiVersion"]) end def rollout_conditions