Merge pull request #433 from cncf/feature/#397-helm

#397 helm prerequisite checker

Author: denverwilliams

spec/configuration_lifecycle_spec.cr

@@ -131,7 +131,7 @@ describe CnfConformance do
     begin
       `./cnf-conformance cnf_setup cnf-path=sample-cnfs/sample_coredns_hardcoded_ips deploy_with_chart=false`
       $?.success?.should be_true
-      response_s = `./cnf-conformance hardcoded_ip_addresses_in_k8s_runtime_configuration verbose`
+      response_s = `LOG_LEVEL=info ./cnf-conformance hardcoded_ip_addresses_in_k8s_runtime_configuration verbose`
       LOGGING.info response_s
       $?.success?.should be_true
       (/FAILURE: Hard-coded IP addresses found in the runtime K8s configuration/ =~ response_s).should_not be_nil

src/tasks/configuration_lifecycle.cr

@@ -230,19 +230,19 @@ task "hardcoded_ip_addresses_in_k8s_runtime_configuration" do |_, args|
     current_dir = FileUtils.pwd
     #helm = "#{current_dir}/#{TOOLS_DIR}/helm/linux-amd64/helm"
     helm = CNFSingleton.helm
-    VERBOSE_LOGGING.debug "Helm Path: #{helm}" if check_verbose(args)
+    VERBOSE_LOGGING.info "Helm Path: #{helm}" if check_verbose(args)
 
     create_namespace = `kubectl create namespace hardcoded-ip-test`
     unless helm_chart.empty?
       helm_install = `#{helm} install --namespace hardcoded-ip-test hardcoded-ip-test #{helm_chart} --dry-run --debug > #{destination_cnf_dir}/helm_chart.yml`
-      VERBOSE_LOGGING.debug "helm_chart: #{helm_chart}" if check_verbose(args)
+      VERBOSE_LOGGING.info "helm_chart: #{helm_chart}" if check_verbose(args)
     else
       helm_install = `#{helm} install --namespace hardcoded-ip-test hardcoded-ip-test #{destination_cnf_dir}/#{helm_directory} --dry-run --debug > #{destination_cnf_dir}/helm_chart.yml`
-      VERBOSE_LOGGING.debug "helm_directory: #{helm_directory}" if check_verbose(args)
+      VERBOSE_LOGGING.info "helm_directory: #{helm_directory}" if check_verbose(args)
     end
 
     ip_search = File.read_lines("#{destination_cnf_dir}/helm_chart.yml").take_while{|x| x.match(/NOTES:/) == nil}.reduce([] of String){|acc, x| x.match(/([0-9]{1,3}[\.]){3}[0-9]{1,3}/) && x.match(/([0-9]{1,3}[\.]){3}[0-9]{1,3}/).try &.[0] != "0.0.0.0" ? acc << x : acc}
-    VERBOSE_LOGGING.debug "IPs: #{ip_search}" if check_verbose(args)
+    VERBOSE_LOGGING.info "IPs: #{ip_search}" if check_verbose(args)
 
     if ip_search.empty? 
       upsert_passed_task("hardcoded_ip_addresses_in_k8s_runtime_configuration", "✔️  PASSED: No hard-coded IP addresses found in the runtime K8s configuration")

src/tasks/prereqs.cr

@@ -11,11 +11,11 @@ require "./utils/system_information/clusterctl.cr"
 
 task "prereqs" do  |_, args|
 
-  if helm_installation.includes?("helm found") &&
-      !CNFManager.helm_gives_k8s_warning?(true) &&
-      wget_installation.includes?("wget found") &&
-      curl_installation.includes?("curl found") &&
-      kubectl_installation.includes?("kubectl found") &&
+  if (helm_installation.includes?("helm found") &&
+      !CNFManager.helm_gives_k8s_warning?(true)) &
+      wget_installation.includes?("wget found") &
+      curl_installation.includes?("curl found") &
+      kubectl_installation.includes?("kubectl found") &
       git_installation.includes?("git found")
 
       verbose = check_verbose(args)

src/tasks/utils/system_information/helm.cr

@@ -11,7 +11,7 @@ def helm_installation(verbose=false)
 
   global_helm_version = helm_version(ghelm, verbose)
 
-  if global_helm_version
+  if global_helm_version && !global_helm_version.empty?
     gmsg = "Global helm found. Version: #{global_helm_version}"
     stdout_success gmsg
   else
@@ -23,7 +23,7 @@ def helm_installation(verbose=false)
 
   local_helm_version = helm_version(lhelm, verbose)
 
-  if local_helm_version
+  if local_helm_version && !local_helm_version.empty?
     lmsg = "Local helm found. Version: #{local_helm_version}"
     stdout_success lmsg