Merge pull request #6050 from tstromberg/cache-chk2

Don't check image versions with the none driver (no crictl)

test/integration/start_stop_delete_test.go

@@ -148,6 +148,7 @@ func TestStartStop(t *testing.T) {
 				}
 
 				// Make sure that kubeadm did not need to pull in additional images
+				if !NoneDriver() {
 					rr, err = Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "sudo crictl images -o json"))
 					if err != nil {
 						t.Errorf("%s failed: %v", rr.Args, err)
@@ -178,6 +179,7 @@ func TestStartStop(t *testing.T) {
 					if diff := cmp.Diff(want, gotImages); diff != "" {
 						t.Errorf("%s images mismatch (-want +got):\n%s", tc.version, diff)
 					}
+				}
 
 				if strings.Contains(tc.name, "cni") {
 					t.Logf("WARNING: cni mode requires additional setup before pods can schedule :(")