use k8s node 1.26.6 and fix unit test

go.mod

@@ -1,6 +1,6 @@
 module github.com/footprintai/multikf
 
-go 1.17
+go 1.20
 
 require (
 	github.com/bmatcuk/go-vagrant v1.6.0

kfmanifests/manifests_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestManifests(t *testing.T) {
 	versions := ListVersions()
-	assert.EqualValues(t, []string{"v1.4.1", "v1.5.1", "v1.6.0", "v1.6.1-lite"}, versions)
+	assert.EqualValues(t, []string{"v1.6.1", "v1.7.0"}, versions)
 
 	for _, version := range versions {
 		foundVersionManifest, err := GetVersion(version)

pkg/machine/docker/hostmachine_test.go

@@ -3,25 +3,75 @@ package docker
 import (
 	"fmt"
 	"os"
+
 	//"os"
 	"testing"
 
+	"github.com/footprintai/multikf/pkg/machine"
 	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/kind/pkg/cmd"
 )
 
 func TestHostCmd(t *testing.T) {
+	if testing.Short() {
+		t.SkipNow()
+	}
+
+	logger := cmd.NewLogger()
 
 	name := "host001"
-	dir := "/var/folders/0g/nmvss1h170b8wgbkgb9csd180000gn/T/unittest4190648733"
+	dir := "/var/folders/gc/cqwxf09s14z7rgpyjyfr3qsh0000gn/T/unittest4190648733"
 	assert.NoError(t, os.MkdirAll(dir, os.ModePerm))
-	defer os.RemoveAll(dir)
+	//defer os.RemoveAll(dir)
 	fmt.Printf("dir:%s\n", dir)
 
-	hostmachines := NewHostMachines(dir, true)
-	m, err := hostmachines.NewMachine(name)
+	hostmachines := NewHostMachines(logger, dir, true)
+	m, err := hostmachines.NewMachine(name, noConfigurer{})
 	assert.NoError(t, err)
-	assert.NoError(t, m.Up(true))
-	_, err := m.Info()
+	assert.NoError(t, m.Up())
+	_, err = m.Info()
 	assert.NoError(t, err)
-	assert.NoError(t, m.Destroy(true))
+	assert.NoError(t, m.Destroy())
+}
+
+type noConfigurer struct{}
+
+func (n noConfigurer) GetCPUs() int {
+	return 1
+}
+
+func (n noConfigurer) GetMemory() int {
+	return 4
+}
+
+func (n noConfigurer) GetGPUs() int {
+	return 0
+}
+
+func (n noConfigurer) GetKubeAPIIP() string {
+	return "0.0.0.0"
+}
+
+func (n noConfigurer) GetExportPorts() []machine.ExportPortPair {
+	return nil
+}
+
+func (n noConfigurer) GetForceOverwriteConfig() bool {
+	return false
+}
+
+func (n noConfigurer) AuditEnabled() bool {
+	return false
+}
+
+func (n noConfigurer) GetWorkers() int {
+	return 0
+}
+
+func (n noConfigurer) GetNodeLabels() []machine.NodeLabel {
+	return nil
+}
+
+func (n noConfigurer) GetLocalPath() string {
+	return ""
 }

pkg/machine/fsutil/fsutil.go

@@ -11,8 +11,11 @@ func FileExists(filepath string) bool {
 
 func Exists(osfs fs.FS, fileName string) bool {
 	_, err := fs.Stat(osfs, fileName)
-	if !os.IsNotExist(err) {
-		return true
+	if os.IsNotExist(err) {
+		return false
 	}
-	return false
+	if err != nil {
+		return false
+	}
+	return true
 }

pkg/machine/meminfo_test.go

@@ -11,7 +11,7 @@ import (
 func TestMemInfo(t *testing.T) {
 	meminfo, err := NewMemInfoParser(testdata.MemInfo)
 	assert.NoError(t, err)
-	assert.EqualValues(t, "0.95 Mib", meminfo.Total())
-	assert.EqualValues(t, "0.07 Mib", meminfo.Free())
+	assert.EqualValues(t, "976.88 Mib", meminfo.Total())
+	assert.EqualValues(t, "68.15 Mib", meminfo.Free())
 
 }

pkg/machine/vagrant/fs_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/footprintai/multikf/pkg/machine/vagrant/template"
+	vagranttemplates "github.com/footprintai/multikf/pkg/machine/vagrant/template"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 )
@@ -32,20 +32,28 @@ func TestVagrantFile(t *testing.T) {
 	fmt.Printf("tmpdir:%s\n", tmpdir)
 	mockFs := afero.NewBasePathFs(afero.NewOsFs(), tmpdir)
 	vdir := NewVagrantFolder(tmpdir)
-	assert.NoError(t, vdir.GenerateVagrantFiles(&template.TemplateFileConfig{
-		Name:        "unittest",
-		CPUs:        2,
-		Memory:      1026,
-		SSHPort:     1234,
-		KubeApiPort: 5678,
-	}))
+	assert.NoError(t, vdir.GenerateVagrantFiles(vagranttemplates.NewVagrantTemplateConfig(
+		"unittest",
+		2,
+		1026,
+		1234,
+		5678,
+		"1.2.3.4",
+		0,
+		nil,
+		false,
+		"",
+		0,
+		nil,
+		"",
+	),
+	))
 
 	expectedFiles := []string{
 		"Vagrantfile",
 		"kind-config.yaml",
 		"bootstrap/bootstrap.sh",
 		"bootstrap/provision-cluster.sh",
-		"bootstrap/provision-kf14.sh",
 	}
 	for _, expectedfile := range expectedFiles {
 		_, err := mockFs.Stat(expectedfile)

pkg/machine/vagrant/vagrant_test.go

@@ -2,25 +2,22 @@ package vagrant
 
 import (
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestVagrantCmd(t *testing.T) {
 	t.SkipNow()
 
-	// only for integration test
-	name := "test001"
-	config := &VagrantMachineConfig{
-		CPUs:   1,
-		Memory: 1024 * 2,
-	}
-	//vagrantDir := newEmptyDir()
-	vagrantDir := "/var/folders/0g/nmvss1h170b8wgbkgb9csd180000gn/T/unittest4190648733"
-	vm := NewVagrantMachines(vagrantDir, true)
-	m := vm.NewMachine(name, config)
-	cli, err := m.NewVagrantCli()
-	assert.NoError(t, err)
-	assert.NoError(t, cli.TryUp(true))
-
+	//// only for integration test
+	//name := "test001"
+	//config := &VagrantMachineConfig{
+	//	CPUs:   1,
+	//	Memory: 1024 * 2,
+	//}
+	////vagrantDir := newEmptyDir()
+	//vagrantDir := "/var/folders/0g/nmvss1h170b8wgbkgb9csd180000gn/T/unittest4190648733"
+	//vm := NewVagrantMachines(vagrantDir, true)
+	//m := vm.NewMachine(name, config)
+	//cli, err := m.NewVagrantCli()
+	//assert.NoError(t, err)
+	//assert.NoError(t, cli.TryUp(true))
 }

pkg/template/kind_template.go

@@ -118,7 +118,7 @@ nodes:
         {{- range $i, $p := .NodeLabels}}
         node-labels: "{{$p}}"
         {{- end}}
-  image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
+  image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
   gpus: {{.UseGPU}}
   {{if .ExportPorts}}extraPortMappings:{{end}}
   {{- range $i, $p := .ExportPorts}}
@@ -140,7 +140,7 @@ nodes:
   {{- end}}
 {{- range .Workers }}
 - role: worker
-  image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
+  image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
   gpus: {{ .UseGPU}}
   {{- if ne .LocalPath ""}}
   extraMounts:

pkg/template/kind_template_test.go

@@ -110,7 +110,7 @@ nodes:
         node-labels: "ingress-ready=true"
         node-labels: "a=b"
         node-labels: "c=d"
-  image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
+  image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
   gpus: true
   extraPortMappings:
   - containerPort: 8081
@@ -123,19 +123,19 @@ nodes:
   - hostPath: /mnt/test
     containerPath: /var/local-path-provisioner
 - role: worker
-  image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
+  image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
   gpus: true
   extraMounts:
   - hostPath: /mnt/test
     containerPath: /var/local-path-provisioner
 - role: worker
-  image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
+  image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
   gpus: true
   extraMounts:
   - hostPath: /mnt/test
     containerPath: /var/local-path-provisioner
 - role: worker
-  image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
+  image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
   gpus: true
   extraMounts:
   - hostPath: /mnt/test
@@ -237,7 +237,7 @@ nodes:
     nodeRegistration:
       kubeletExtraArgs:
         node-labels: "ingress-ready=true"
-  image: kindest/node:v1.23.17@sha256:e5fd1d9cd7a9a50939f9c005684df5a6d145e8d695e78463637b79464292e66c
+  image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
   gpus: false
   extraPortMappings:
   - containerPort: 8081