Updates according to cnf-testsuite/kubectl_client#17 (#5)

Updates according to cnf-testsuite/kubectl_client#17

Signed-off-by: Rafal Lal <rafal.lal@tietoevry.com>

Author: rafal-lal

shard.lock

@@ -2,7 +2,7 @@ version: 2.0
 shards:
   cluster_tools:
     git: https://github.com/cnf-testsuite/cluster_tools.git
-    version: 1.0.0
+    version: 1.0.11
 
   docker_client:
     git: https://github.com/cnf-testsuite/docker_client.git
@@ -18,15 +18,15 @@ shards:
 
   helm:
     git: https://github.com/cnf-testsuite/helm.git
-    version: 1.0.1
+    version: 1.0.5
 
   kernel_introspection:
     git: https://github.com/cnf-testsuite/kernel_introspection.git
     version: 0.1.0
 
   kubectl_client:
     git: https://github.com/cnf-testsuite/kubectl_client.git
-    version: 1.0.1
+    version: 1.0.8
 
   popcorn:
     git: https://github.com/icyleaf/popcorn.git

shard.yml

@@ -16,14 +16,13 @@ targets:
 dependencies:
   kubectl_client:
     github: cnf-testsuite/kubectl_client
-    version: ~> 1.0.0
+    version: ~> 1.0.8
   kernel_introspection:
     github: cnf-testsuite/kernel_introspection
     version: ~> 0.1.0
   cluster_tools:
-    # path: ../cluster_tools
     github: cnf-testsuite/cluster_tools
-    version: ~> 1.0.0
+    version: ~> 1.0.11
   helm:
     github: cnf-testsuite/helm
-    version: ~> 1.0.0
+    version: ~> 1.0.5

spec/netstat/k8s_spec.cr

@@ -8,8 +8,8 @@ require "../../src/netstat/k8s.cr"
 describe "netstat" do
   before_all do
     begin
-      KubectlClient::Create.namespace("cnf-testsuite")
-    rescue e : KubectlClient::Create::AlreadyExistsError
+      KubectlClient::Apply.namespace("cnf-testsuite")
+    rescue e : KubectlClient::ShellCMD::AlreadyExistsError
     end
     ClusterTools.install
   end
@@ -19,25 +19,28 @@ describe "netstat" do
     release_name = "wordpress"
     helm_chart_directory = "sample-cnfs/ndn-multi-db-connections-fail/wordpress"
 
-    after_all do 
+    after_all do
       resp = Helm.uninstall(release_name)
-      KubectlClient::Delete.command("pvc/data-wordpress-mariadb-0")
-      KubectlClient::Delete.command("pvc/wordpress")
+      begin
+        KubectlClient::Delete.resource("pvc", "data-wordpress-mariadb-0")
+        KubectlClient::Delete.resource("pvc", "wordpress")
+      rescue ex : KubectlClient::ShellCMD::NotFoundError
+      end
       Log.info { resp }
       (resp[:status].exit_status == 0).should be_true
     end
 
     it "should install" do
       helm_install(release_name, helm_chart_directory)
     end
-    
+
     it "k8s_netstat should detect multiple pods conected to same db" do
-      KubectlClient::Get.resource_wait_for_install(kind="Deployment", resource_name="wordpress", wait_count=180, namespace="default")
+      KubectlClient::Wait.resource_wait_for_install(kind = "Deployment", resource_name = "wordpress", wait_count = 180, namespace = "default")
       violators = Netstat::K8s.get_multiple_pods_connected_to_mariadb_violators
       (Netstat::K8s.detect_multiple_pods_connected_to_mariadb_from_violators(violators)).should be_false
     end
   end
-  
+
   describe "cnf with no database is used by two microservices" do
     # sample-cnfs/sample-statefulset-cnf
     release_name = "test"
@@ -47,23 +50,25 @@ describe "netstat" do
       Helm.helm_repo_add("bitnami", "https://charts.bitnami.com/bitnami")
     end
 
-    after_all do 
+    after_all do
       resp = Helm.uninstall(release_name)
-      KubectlClient::Delete.command("pvc/data-wordpress-mariadb-0")
-      KubectlClient::Delete.command("pvc/wordpress")
+      begin
+        KubectlClient::Delete.resource("pvc", "data-wordpress-mariadb-0")
+        KubectlClient::Delete.resource("pvc", "wordpress")
+      rescue ex : KubectlClient::ShellCMD::NotFoundError
+      end
       Log.info { resp }
       (resp[:status].exit_status == 0).should be_true
     end
 
     it "should install" do
       helm_install(release_name, helm_chart, nil, "--set mariadb.primary.persistence.enabled=false --set persistence.enabled=false")
     end
-    
+
     it "k8s_netstat should detect mutiple pods NOT connected to same db" do
-      KubectlClient::Get.resource_wait_for_install(kind="Deployment", resource_name="test-wordpress", wait_count=180, namespace="default")
+      KubectlClient::Wait.resource_wait_for_install(kind = "Deployment", resource_name = "test-wordpress", wait_count = 180, namespace = "default")
       violators = Netstat::K8s.get_multiple_pods_connected_to_mariadb_violators
       (Netstat::K8s.detect_multiple_pods_connected_to_mariadb_from_violators(violators)).should be_false
     end
   end
-
 end

src/netstat/k8s.cr

@@ -11,11 +11,11 @@ module Netstat
 
       db_pod_ips = self.get_pods_ips(db_pods)
       Log.info { "DB Pods ips #{db_pod_ips}" }
-      db_pod_ips 
+      db_pod_ips
     end
 
     def self.get_all_non_db_service_pod_ips
-      cnf_services = KubectlClient::Get.services(all_namespaces: true)
+      cnf_services = KubectlClient::Get.resource("services", all_namespaces: true)
       Log.info { "all namespace services: #{cnf_services}" }
 
       db_pod_ips = self.get_all_db_pod_ips
@@ -107,6 +107,14 @@ module Netstat
       Log.info { "get_pod_network_info_from_node_via_container_id: node_name: #{node_name} container_id: #{container_id}" }
 
       inspect = ClusterTools.exec_by_node("crictl inspect #{container_id}", node_name)
+      if inspect.nil?
+        return [] of NamedTuple(proto: String,
+          recv: String,
+          send: String,
+          local_address: String,
+          foreign_address: String,
+          state: String)
+      end
 
       pid = JSON.parse(inspect["output"]).dig("info", "pid")
       Log.info { "Container PID: #{pid}" }
@@ -115,6 +123,9 @@ module Netstat
       parsed_netstat = (1..30).map {
         sleep 10
         netstat = ClusterTools.exec_by_node("nsenter -t #{pid} -n netstat -n", node_name)
+        if netstat.nil?
+          next
+        end
         Log.info { "Container Netstat: #{netstat}" }
         Netstat.parse(netstat["output"])
       }.flatten.compact