Skip to content

Commit e9bea18

Browse files
committed
test(integration): use the new kind options
Signed-off-by: Lorenzo Fontana <[email protected]>
1 parent 321f94d commit e9bea18

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

integration/suite_test.go

+7-10
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ import (
88
"testing"
99
"time"
1010

11+
"github.com/davecgh/go-spew/spew"
1112
"github.com/go-check/check"
1213
"github.com/iovisor/kubectl-trace/pkg/cmd"
1314
"gotest.tools/icmd"
1415
"sigs.k8s.io/kind/pkg/cluster"
1516
"sigs.k8s.io/kind/pkg/cluster/config/encoding"
17+
"sigs.k8s.io/kind/pkg/cluster/create"
1618
)
1719

1820
var (
1921
KubectlTraceBinary = os.Getenv("TEST_KUBECTLTRACE_BINARY")
20-
KindImageTag = os.Getenv("TEST_KIND_IMAGETAG")
2122
)
2223

2324
type KubectlTraceSuite struct {
@@ -30,26 +31,20 @@ func init() {
3031
KubectlTraceBinary = "kubectl-trace"
3132
}
3233

33-
if KindImageTag == "" {
34-
KindImageTag = "kindest/node:v1.12.3"
35-
}
3634
check.Suite(&KubectlTraceSuite{})
3735
}
3836

3937
func (k *KubectlTraceSuite) SetUpSuite(c *check.C) {
4038
cfg, err := encoding.Load("")
4139
c.Assert(err, check.IsNil)
42-
retain := false
43-
wait := time.Duration(0)
44-
4540
err = cfg.Validate()
4641
c.Assert(err, check.IsNil)
4742

4843
clusterName, err := generateClusterName()
4944
c.Assert(err, check.IsNil)
5045
kctx := cluster.NewContext(clusterName)
5146

52-
err = kctx.Create(cfg, retain, wait)
47+
err = kctx.Create(cfg, create.Retain(false), create.WaitForReady(time.Duration(0)))
5348
c.Assert(err, check.IsNil)
5449
k.kindContext = kctx
5550

@@ -61,12 +56,14 @@ func (k *KubectlTraceSuite) SetUpSuite(c *check.C) {
6156
for _, n := range nodes {
6257
loadcomm := fmt.Sprintf("docker save %s | docker exec -i %s docker load", cmd.ImageNameTag, n.String())
6358
res := icmd.RunCommand("bash", "-c", loadcomm)
59+
spew.Dump(loadcomm)
60+
spew.Dump(res)
6461
c.Assert(res.Error, check.IsNil)
6562
}
6663
}
6764

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()
7067
c.Assert(err, check.IsNil)
7168
}
7269

0 commit comments

Comments
 (0)