fix unittests

pull/364/head
iwilltry42 4 years ago
parent c35eb2c13f
commit b5a9d6397f
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
  1. 4
      pkg/cluster/cluster.go
  2. 2
      pkg/runtimes/containerd/node.go
  3. 34
      pkg/runtimes/docker/translate_test.go

@ -290,12 +290,12 @@ func ClusterCreate(ctx context.Context, runtime k3drt.Runtime, cluster *k3d.Clus
split := strings.Split(port, "-") split := strings.Split(port, "-")
start, err := strconv.Atoi(split[0]) start, err := strconv.Atoi(split[0])
if err != nil { 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 return err
} }
end, err := strconv.Atoi(split[1]) end, err := strconv.Atoi(split[1])
if err != nil { 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 return err
} }
for i := start; i <= end; i++ { for i := start; i <= end; i++ {

@ -91,7 +91,7 @@ func (d Containerd) DeleteNode(ctx context.Context, node *k3d.Node) error {
return err return err
} }
if err = container.Delete(ctx, []containerd.DeleteOpts{}...); err != nil { 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 return err
} }

@ -48,26 +48,40 @@ func TestTranslateNodeToContainer(t *testing.T) {
Labels: map[string]string{k3d.LabelRole: string(k3d.ServerRole), "test_key_1": "test_val_1"}, Labels: map[string]string{k3d.LabelRole: string(k3d.ServerRole), "test_key_1": "test_val_1"},
} }
init := true
expectedRepresentation := &NodeInDocker{ expectedRepresentation := &NodeInDocker{
ContainerConfig: container.Config{ ContainerConfig: container.Config{
Hostname: "test", Hostname: "test",
Image: "rancher/k3s:v0.9.0", Image: "rancher/k3s:v0.9.0",
Env: []string{"TEST_KEY_1=TEST_VAL_1"}, Env: []string{"TEST_KEY_1=TEST_VAL_1"},
Cmd: []string{"server", "--https-listen-port=6443", "--some-boolflag"}, Cmd: []string{"server", "--https-listen-port=6443", "--some-boolflag"},
Labels: map[string]string{k3d.LabelRole: string(k3d.ServerRole), "test_key_1": "test_val_1"}, Labels: map[string]string{k3d.LabelRole: string(k3d.ServerRole), "test_key_1": "test_val_1"},
ExposedPorts: nat.PortSet{}, ExposedPorts: nat.PortSet{
"6443/tcp": {},
},
}, },
HostConfig: container.HostConfig{ HostConfig: container.HostConfig{
Binds: []string{"/test:/tmp/test"}, Binds: []string{"/test:/tmp/test"},
RestartPolicy: container.RestartPolicy{ RestartPolicy: container.RestartPolicy{
Name: "unless-stopped", Name: "unless-stopped",
}, },
Privileged: true, Init: &init,
Tmpfs: map[string]string{"/run": "", "/var/run": ""}, Privileged: true,
PortBindings: nat.PortMap{}, Tmpfs: map[string]string{"/run": "", "/var/run": ""},
PortBindings: nat.PortMap{
"6443/tcp": {
{
HostIP: "0.0.0.0",
HostPort: "6443",
},
},
},
}, },
NetworkingConfig: network.NetworkingConfig{ NetworkingConfig: network.NetworkingConfig{
EndpointsConfig: map[string]*network.EndpointSettings{}, EndpointsConfig: map[string]*network.EndpointSettings{
"": {},
},
}, },
} }

Loading…
Cancel
Save