@@ -8,16 +8,17 @@ import (
8
8
"testing"
9
9
"time"
10
10
11
+ "github.com/davecgh/go-spew/spew"
11
12
"github.com/go-check/check"
12
13
"github.com/iovisor/kubectl-trace/pkg/cmd"
13
14
"gotest.tools/icmd"
14
15
"sigs.k8s.io/kind/pkg/cluster"
15
16
"sigs.k8s.io/kind/pkg/cluster/config/encoding"
17
+ "sigs.k8s.io/kind/pkg/cluster/create"
16
18
)
17
19
18
20
var (
19
21
KubectlTraceBinary = os .Getenv ("TEST_KUBECTLTRACE_BINARY" )
20
- KindImageTag = os .Getenv ("TEST_KIND_IMAGETAG" )
21
22
)
22
23
23
24
type KubectlTraceSuite struct {
@@ -30,26 +31,20 @@ func init() {
30
31
KubectlTraceBinary = "kubectl-trace"
31
32
}
32
33
33
- if KindImageTag == "" {
34
- KindImageTag = "kindest/node:v1.12.3"
35
- }
36
34
check .Suite (& KubectlTraceSuite {})
37
35
}
38
36
39
37
func (k * KubectlTraceSuite ) SetUpSuite (c * check.C ) {
40
38
cfg , err := encoding .Load ("" )
41
39
c .Assert (err , check .IsNil )
42
- retain := false
43
- wait := time .Duration (0 )
44
-
45
40
err = cfg .Validate ()
46
41
c .Assert (err , check .IsNil )
47
42
48
43
clusterName , err := generateClusterName ()
49
44
c .Assert (err , check .IsNil )
50
45
kctx := cluster .NewContext (clusterName )
51
46
52
- err = kctx .Create (cfg , retain , wait )
47
+ err = kctx .Create (cfg , create . Retain ( false ), create . WaitForReady ( time . Duration ( 0 )) )
53
48
c .Assert (err , check .IsNil )
54
49
k .kindContext = kctx
55
50
@@ -61,12 +56,14 @@ func (k *KubectlTraceSuite) SetUpSuite(c *check.C) {
61
56
for _ , n := range nodes {
62
57
loadcomm := fmt .Sprintf ("docker save %s | docker exec -i %s docker load" , cmd .ImageNameTag , n .String ())
63
58
res := icmd .RunCommand ("bash" , "-c" , loadcomm )
59
+ spew .Dump (loadcomm )
60
+ spew .Dump (res )
64
61
c .Assert (res .Error , check .IsNil )
65
62
}
66
63
}
67
64
68
- func (s * KubectlTraceSuite ) TearDownSuite (c * check.C ) {
69
- err := s .kindContext .Delete ()
65
+ func (k * KubectlTraceSuite ) TearDownSuite (c * check.C ) {
66
+ err := k .kindContext .Delete ()
70
67
c .Assert (err , check .IsNil )
71
68
}
72
69
0 commit comments