diff --git a/Makefile b/Makefile index 45ebee76..e99dc6e3 100644 --- a/Makefile +++ b/Makefile @@ -93,5 +93,5 @@ ifndef HAS_GOX (go get $(PKG_GOX)) endif ifndef HAS_GOLANGCI - (curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${GOPATH}/bin v1.17.1) + (curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${GOPATH}/bin v1.19.1) endif diff --git a/pkg/cluster/node.go b/pkg/cluster/node.go index 0c975825..bc36e74b 100644 --- a/pkg/cluster/node.go +++ b/pkg/cluster/node.go @@ -39,7 +39,7 @@ func CreateNode(nodeSpec *k3d.Node, runtimeChoice string) error { runtime = k3dContainerd.Containerd{} } - if err := runtime.CreateNode(&k3d.Node{}); err != nil { + if err := runtime.CreateNode(nodeSpec); err != nil { log.Error(err) } log.Debugln("...success") diff --git a/pkg/runtimes/docker/container.go b/pkg/runtimes/docker/container.go index 558559a1..7f3c9fd0 100644 --- a/pkg/runtimes/docker/container.go +++ b/pkg/runtimes/docker/container.go @@ -48,7 +48,7 @@ func (d Docker) CreateNode(nodeSpec *k3d.Node) error { Image: "nginx", } - resp, err := docker.ContainerCreate(ctx, &containerConfig, &container.HostConfig{}, &network.NetworkingConfig{}, "test") + resp, err := docker.ContainerCreate(ctx, &containerConfig, &container.HostConfig{}, &network.NetworkingConfig{}, nodeSpec.Name) if err != nil { log.Error("Couldn't create container") return err @@ -85,6 +85,8 @@ func removeContainer(ID string) error { return fmt.Errorf("Failed to delete container '%s'. %+v", ID, err) } + log.Infoln("Deleted", ID) + return nil }