Update default Kubernetes to 1.18 (#657)

* Update default Kubernetes to 1.18 * Add missing mapping * Show pod logs on failure
aquasecurity · Aug 4, 2020 · b0d175b · b0d175b
1 parent e69b2fe
commit b0d175b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cmd/common_test.go b/cmd/common_test.go
@@ -213,6 +213,7 @@ func TestMapToCISVersion(t *testing.T) {
 		{kubeVersion: "1.15", succeed: true, exp: "cis-1.5"},
 		{kubeVersion: "1.16", succeed: true, exp: "cis-1.5"},
 		{kubeVersion: "1.17", succeed: true, exp: "cis-1.5"},
+		{kubeVersion: "1.18", succeed: true, exp: "cis-1.5"},
 		{kubeVersion: "gke-1.0", succeed: true, exp: "gke-1.0"},
 		{kubeVersion: "ocp-3.10", succeed: true, exp: "rh-0.7"},
 		{kubeVersion: "ocp-3.11", succeed: true, exp: "rh-0.7"},

diff --git a/cmd/root.go b/cmd/root.go
@@ -34,7 +34,7 @@ type FilterOpts struct {
 
 var (
 	envVarsPrefix       = "KUBE_BENCH"
-	defaultKubeVersion  = "1.11"
+	defaultKubeVersion  = "1.18"
 	kubeVersion         string
 	benchmarkVersion    string
 	cfgFile             string

diff --git a/integration/integration.go b/integration/integration.go
@@ -113,10 +113,10 @@ func findPodForJob(clientset *kubernetes.Clientset, jobName string, duration tim
 
 					if cp.Status.Phase == apiv1.PodFailed {
 						fmt.Printf("pod (%s) - %s - retrying...\n", cp.Name, cp.Status.Phase)
+						fmt.Printf(getPodLogs(clientset, &cp))
 						failedPods[cp.Name] = struct{}{}
 						break podfailed
 					}
-
 				}
 			}
 		}