diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index fc3d3308..c3b1d76c 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -290,12 +290,12 @@ func ClusterCreate(ctx context.Context, runtime k3drt.Runtime, cluster *k3d.Clus split := strings.Split(port, "-") start, err := strconv.Atoi(split[0]) if err != nil { - log.Errorln("Failed to parse port mapping for loadbalancer '%s'", port) + log.Errorf("Failed to parse port mapping for loadbalancer '%s'", port) return err } end, err := strconv.Atoi(split[1]) if err != nil { - log.Errorln("Failed to parse port mapping for loadbalancer '%s'", port) + log.Errorf("Failed to parse port mapping for loadbalancer '%s'", port) return err } for i := start; i <= end; i++ { diff --git a/pkg/runtimes/containerd/node.go b/pkg/runtimes/containerd/node.go index c947c08c..6589d539 100644 --- a/pkg/runtimes/containerd/node.go +++ b/pkg/runtimes/containerd/node.go @@ -91,7 +91,7 @@ func (d Containerd) DeleteNode(ctx context.Context, node *k3d.Node) error { return err } if err = container.Delete(ctx, []containerd.DeleteOpts{}...); err != nil { - log.Errorf("Failed to delete container '%s'", container.ID) + log.Errorf("Failed to delete container '%s'", container.ID()) return err } diff --git a/pkg/runtimes/docker/translate_test.go b/pkg/runtimes/docker/translate_test.go index 29116408..78f89c4c 100644 --- a/pkg/runtimes/docker/translate_test.go +++ b/pkg/runtimes/docker/translate_test.go @@ -48,26 +48,40 @@ func TestTranslateNodeToContainer(t *testing.T) { Labels: map[string]string{k3d.LabelRole: string(k3d.ServerRole), "test_key_1": "test_val_1"}, } + init := true + expectedRepresentation := &NodeInDocker{ ContainerConfig: container.Config{ - Hostname: "test", - Image: "rancher/k3s:v0.9.0", - Env: []string{"TEST_KEY_1=TEST_VAL_1"}, - Cmd: []string{"server", "--https-listen-port=6443", "--some-boolflag"}, - Labels: map[string]string{k3d.LabelRole: string(k3d.ServerRole), "test_key_1": "test_val_1"}, - ExposedPorts: nat.PortSet{}, + Hostname: "test", + Image: "rancher/k3s:v0.9.0", + Env: []string{"TEST_KEY_1=TEST_VAL_1"}, + Cmd: []string{"server", "--https-listen-port=6443", "--some-boolflag"}, + Labels: map[string]string{k3d.LabelRole: string(k3d.ServerRole), "test_key_1": "test_val_1"}, + ExposedPorts: nat.PortSet{ + "6443/tcp": {}, + }, }, HostConfig: container.HostConfig{ Binds: []string{"/test:/tmp/test"}, RestartPolicy: container.RestartPolicy{ Name: "unless-stopped", }, - Privileged: true, - Tmpfs: map[string]string{"/run": "", "/var/run": ""}, - PortBindings: nat.PortMap{}, + Init: &init, + Privileged: true, + Tmpfs: map[string]string{"/run": "", "/var/run": ""}, + PortBindings: nat.PortMap{ + "6443/tcp": { + { + HostIP: "0.0.0.0", + HostPort: "6443", + }, + }, + }, }, NetworkingConfig: network.NetworkingConfig{ - EndpointsConfig: map[string]*network.EndpointSettings{}, + EndpointsConfig: map[string]*network.EndpointSettings{ + "": {}, + }, }, }