diff --git a/.github/workflows/testdata.yaml b/.github/workflows/testdata.yaml index d4287d9..c646aa5 100644 --- a/.github/workflows/testdata.yaml +++ b/.github/workflows/testdata.yaml @@ -59,4 +59,6 @@ jobs: run: make testdata - name: Check diff - run: git diff --exit-code -- . + run: | # Ignore file mode. + git config core.filemode false + git diff --exit-code -- . diff --git a/Makefile b/Makefile index 105dee8..70f9ea3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ gofumpt := mvdan.cc/gofumpt@v0.5.0 gosimports := github.com/rinchsan/gosimports/cmd/gosimports@v0.3.8 -golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 +golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.5 tinygo_targets := examples/nodenumber/main.wasm examples/advanced/main.wasm examples/imagelocality/main.wasm guest/testdata/cyclestate/main.wasm guest/testdata/filter/main.wasm guest/testdata/score/main.wasm \ guest/testdata/bind/main.wasm guest/testdata/reserve/main.wasm guest/testdata/handle/main.wasm guest/testdata/permit/main.wasm \ internal/e2e/scheduler_perf/wasm/nodenumber/main.wasm diff --git a/examples/advanced/go.mod b/examples/advanced/go.mod index 8a7a3a3..bf1afa7 100644 --- a/examples/advanced/go.mod +++ b/examples/advanced/go.mod @@ -3,15 +3,11 @@ module sigs.k8s.io/kube-scheduler-wasm-extension/examples/advanced go 1.22.0 require ( - github.com/wasilibs/nottinygc v0.4.0 sigs.k8s.io/kube-scheduler-wasm-extension/guest v0.0.0-00010101000000-000000000000 sigs.k8s.io/kube-scheduler-wasm-extension/kubernetes/proto v0.0.0-00010101000000-000000000000 ) -require ( - github.com/magefile/mage v1.14.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect -) +require google.golang.org/protobuf v1.30.0 // indirect replace sigs.k8s.io/kube-scheduler-wasm-extension/guest => ./../../guest diff --git a/examples/advanced/go.sum b/examples/advanced/go.sum index 09843cb..a3ed1d4 100644 --- a/examples/advanced/go.sum +++ b/examples/advanced/go.sum @@ -2,10 +2,6 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo= -github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= -github.com/wasilibs/nottinygc v0.4.0 h1:h1TJMihMC4neN6Zq+WKpLxgd9xCFMw7O9ETLwY2exJQ= -github.com/wasilibs/nottinygc v0.4.0/go.mod h1:oDcIotskuYNMpqMF23l7Z8uzD4TC0WXHK8jetlB3HIo= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= diff --git a/examples/advanced/main.wasm b/examples/advanced/main.wasm index d199d7c..b9c8484 100755 Binary files a/examples/advanced/main.wasm and b/examples/advanced/main.wasm differ diff --git a/examples/advanced/plugin/plugin_test.go b/examples/advanced/plugin/plugin_test.go index 1e023ed..7483bd1 100644 --- a/examples/advanced/plugin/plugin_test.go +++ b/examples/advanced/plugin/plugin_test.go @@ -61,7 +61,7 @@ func Test_NodeNumber(t *testing.T) { t.Fatalf("unexpected status: %v", status) } - score, status := plugin.Score(state, nil, tc.nodeName) + score, status := plugin.Score(state, nil, testNodeInfo{name: tc.nodeName}) if status != nil { t.Fatalf("unexpected status: %v", status) } @@ -173,3 +173,39 @@ func (t testPod) Spec() *protoapi.PodSpec { func (t testPod) Status() *protoapi.PodStatus { return nil } + +type testNodeInfo struct { + name string +} + +func (t testNodeInfo) GetUid() string { + return "" +} + +func (t testNodeInfo) GetName() string { + return t.name +} + +func (t testNodeInfo) GetNamespace() string { + return "" +} + +func (t testNodeInfo) GetResourceVersion() string { + return "v1" +} + +func (t testNodeInfo) GetLabels() map[string]string { + return map[string]string{} +} + +func (t testNodeInfo) GetAnnotations() map[string]string { + return map[string]string{} +} + +func (t testNodeInfo) Node() proto.Node { + return nil +} + +func (t testNodeInfo) ImageStates() map[string]*api.ImageStateSummary { + return nil +} diff --git a/examples/imagelocality/main.wasm b/examples/imagelocality/main.wasm index 54482c6..a9c5924 100755 Binary files a/examples/imagelocality/main.wasm and b/examples/imagelocality/main.wasm differ diff --git a/examples/nodenumber/main.wasm b/examples/nodenumber/main.wasm index 79055af..8225e5f 100755 Binary files a/examples/nodenumber/main.wasm and b/examples/nodenumber/main.wasm differ diff --git a/guest/testdata/bind/main.wasm b/guest/testdata/bind/main.wasm index 668d167..afd83c0 100755 Binary files a/guest/testdata/bind/main.wasm and b/guest/testdata/bind/main.wasm differ diff --git a/guest/testdata/cyclestate/main.wasm b/guest/testdata/cyclestate/main.wasm index 439bfb8..eafe1fd 100755 Binary files a/guest/testdata/cyclestate/main.wasm and b/guest/testdata/cyclestate/main.wasm differ diff --git a/guest/testdata/filter/main.wasm b/guest/testdata/filter/main.wasm index 98fc322..4961baa 100755 Binary files a/guest/testdata/filter/main.wasm and b/guest/testdata/filter/main.wasm differ diff --git a/guest/testdata/handle/main.wasm b/guest/testdata/handle/main.wasm index edadc10..51a7622 100755 Binary files a/guest/testdata/handle/main.wasm and b/guest/testdata/handle/main.wasm differ diff --git a/guest/testdata/permit/main.wasm b/guest/testdata/permit/main.wasm index d1471a9..16eba94 100755 Binary files a/guest/testdata/permit/main.wasm and b/guest/testdata/permit/main.wasm differ diff --git a/guest/testdata/reserve/main.wasm b/guest/testdata/reserve/main.wasm index cda8cd1..b43d4d3 100755 Binary files a/guest/testdata/reserve/main.wasm and b/guest/testdata/reserve/main.wasm differ diff --git a/guest/testdata/score/main.wasm b/guest/testdata/score/main.wasm index df23a1b..f21f0cf 100755 Binary files a/guest/testdata/score/main.wasm and b/guest/testdata/score/main.wasm differ diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index e3c1cb3..bc9aa54 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -7,7 +7,6 @@ require ( github.com/labstack/echo v3.3.10+incompatible github.com/stealthrocket/wzprof v0.1.5 github.com/tetratelabs/wazero v1.7.2 - github.com/wasilibs/nottinygc v0.7.1 go.uber.org/zap v1.27.0 k8s.io/api v0.33.4 k8s.io/apimachinery v0.33.4 @@ -93,7 +92,6 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/labstack/gommon v0.4.0 // indirect - github.com/magefile/mage v1.14.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.11 // indirect github.com/mattn/go-isatty v0.0.17 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index f3895bb..b39d454 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -119,8 +119,6 @@ github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s= github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo= -github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs= @@ -205,8 +203,6 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/wasilibs/nottinygc v0.7.1 h1:rKu19+SFniRNuSo5NX7/wxpSpXmMUmkcyt/YiWLJg8w= -github.com/wasilibs/nottinygc v0.7.1/go.mod h1:oDcIotskuYNMpqMF23l7Z8uzD4TC0WXHK8jetlB3HIo= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 h1:S2dVYn90KE98chqDkyE9Z4N61UnQd+KOfgp5Iu53llk= diff --git a/internal/e2e/guest/go.mod b/internal/e2e/guest/go.mod index 212560d..3c551d8 100644 --- a/internal/e2e/guest/go.mod +++ b/internal/e2e/guest/go.mod @@ -3,15 +3,11 @@ module sigs.k8s.io/kube-scheduler-wasm-extension/internal/e2e/guest go 1.22.0 require ( - github.com/wasilibs/nottinygc v0.4.0 sigs.k8s.io/kube-scheduler-wasm-extension/guest v0.0.0-00010101000000-000000000000 sigs.k8s.io/kube-scheduler-wasm-extension/kubernetes/proto v0.0.0-00010101000000-000000000000 ) -require ( - github.com/magefile/mage v1.14.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect -) +require google.golang.org/protobuf v1.30.0 // indirect replace sigs.k8s.io/kube-scheduler-wasm-extension/guest => ./../../../guest diff --git a/internal/e2e/guest/go.sum b/internal/e2e/guest/go.sum index 09843cb..a3ed1d4 100644 --- a/internal/e2e/guest/go.sum +++ b/internal/e2e/guest/go.sum @@ -2,10 +2,6 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo= -github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= -github.com/wasilibs/nottinygc v0.4.0 h1:h1TJMihMC4neN6Zq+WKpLxgd9xCFMw7O9ETLwY2exJQ= -github.com/wasilibs/nottinygc v0.4.0/go.mod h1:oDcIotskuYNMpqMF23l7Z8uzD4TC0WXHK8jetlB3HIo= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= diff --git a/internal/e2e/scheduler_perf/wasm/nodenumber/main.wasm b/internal/e2e/scheduler_perf/wasm/nodenumber/main.wasm index 136ac3a..7febacd 100755 Binary files a/internal/e2e/scheduler_perf/wasm/nodenumber/main.wasm and b/internal/e2e/scheduler_perf/wasm/nodenumber/main.wasm differ