From 2496126c8a6bd148cfdec6e32c508fa796639cd3 Mon Sep 17 00:00:00 2001 From: Daniel Aberger Date: Mon, 11 Mar 2024 10:31:36 +0100 Subject: [PATCH 1/2] move node-installer examples to sub directory --- example/{ => node-installer}/daemonset.yaml | 0 example/{ => node-installer}/debug.yaml | 0 example/{ => node-installer}/install-job.yaml | 0 example/{ => node-installer}/runtimeclass.yaml | 0 example/{ => node-installer}/test-job.yaml | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename example/{ => node-installer}/daemonset.yaml (100%) rename example/{ => node-installer}/debug.yaml (100%) rename example/{ => node-installer}/install-job.yaml (100%) rename example/{ => node-installer}/runtimeclass.yaml (100%) rename example/{ => node-installer}/test-job.yaml (100%) diff --git a/example/daemonset.yaml b/example/node-installer/daemonset.yaml similarity index 100% rename from example/daemonset.yaml rename to example/node-installer/daemonset.yaml diff --git a/example/debug.yaml b/example/node-installer/debug.yaml similarity index 100% rename from example/debug.yaml rename to example/node-installer/debug.yaml diff --git a/example/install-job.yaml b/example/node-installer/install-job.yaml similarity index 100% rename from example/install-job.yaml rename to example/node-installer/install-job.yaml diff --git a/example/runtimeclass.yaml b/example/node-installer/runtimeclass.yaml similarity index 100% rename from example/runtimeclass.yaml rename to example/node-installer/runtimeclass.yaml diff --git a/example/test-job.yaml b/example/node-installer/test-job.yaml similarity index 100% rename from example/test-job.yaml rename to example/node-installer/test-job.yaml From c1689abf43ba9bf170090250c5ee05614caea097 Mon Sep 17 00:00:00 2001 From: Daniel Aberger Date: Mon, 11 Mar 2024 10:34:41 +0100 Subject: [PATCH 2/2] move node-installer testdata into sub directory for clarity --- cmd/node-installer/install_test.go | 10 +++++----- pkg/containerd/configure_test.go | 14 +++++++------- pkg/shim/install_test.go | 16 ++++++++-------- pkg/state/state_test.go | 6 +++--- .../assets/containerd-shim-slight-v1 | 0 .../assets/containerd-shim-spin-v1 | 0 .../etc/containerd/config.toml | 0 .../opt/kwasm/bin/containerd-shim-spin-v1 | 0 .../opt/kwasm/kwasm-lock.json | 0 .../etc/containerd/.gitkeep | 0 .../etc/containerd/config.toml | 0 .../shim/opt/kwasm/bin/containerd-shim-spin-v1 | 0 .../shim/opt/kwasm/kwasm-lock.json | 0 tests/{ => node-installer}/fs.go | 0 14 files changed, 23 insertions(+), 23 deletions(-) rename testdata/{ => node-installer}/assets/containerd-shim-slight-v1 (100%) rename testdata/{ => node-installer}/assets/containerd-shim-spin-v1 (100%) rename testdata/{ => node-installer}/containerd/existing-containerd-shim-config/etc/containerd/config.toml (100%) rename testdata/{ => node-installer}/containerd/existing-containerd-shim-config/opt/kwasm/bin/containerd-shim-spin-v1 (100%) rename testdata/{ => node-installer}/containerd/existing-containerd-shim-config/opt/kwasm/kwasm-lock.json (100%) rename testdata/{ => node-installer}/containerd/missing-containerd-config/etc/containerd/.gitkeep (100%) rename testdata/{ => node-installer}/containerd/missing-containerd-shim-config/etc/containerd/config.toml (100%) rename testdata/{ => node-installer}/shim/opt/kwasm/bin/containerd-shim-spin-v1 (100%) rename testdata/{ => node-installer}/shim/opt/kwasm/kwasm-lock.json (100%) rename tests/{ => node-installer}/fs.go (100%) diff --git a/cmd/node-installer/install_test.go b/cmd/node-installer/install_test.go index 35e1cf1..8dc8fa7 100644 --- a/cmd/node-installer/install_test.go +++ b/cmd/node-installer/install_test.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/afero" main "github.com/spinkube/runtime-class-manager/cmd/node-installer" - "github.com/spinkube/runtime-class-manager/tests" + tests "github.com/spinkube/runtime-class-manager/tests/node-installer" "github.com/stretchr/testify/require" ) @@ -56,8 +56,8 @@ func Test_RunInstall(t *testing.T) { }{"/opt/kwasm", "/assets"}, struct{ RootPath string }{"/containerd/missing-containerd-shim-config"}, }, - tests.FixtureFs("../../testdata"), - tests.FixtureFs("../../testdata/containerd/missing-containerd-shim-config"), + tests.FixtureFs("../../testdata/node-installer"), + tests.FixtureFs("../../testdata/node-installer/containerd/missing-containerd-shim-config"), }, false, }, @@ -75,8 +75,8 @@ func Test_RunInstall(t *testing.T) { }{"/opt/kwasm", "/assets"}, struct{ RootPath string }{"/containerd/existing-containerd-shim-config"}, }, - tests.FixtureFs("../../testdata"), - tests.FixtureFs("../../testdata/containerd/existing-containerd-shim-config"), + tests.FixtureFs("../../testdata/node-installer"), + tests.FixtureFs("../../testdata/node-installer/containerd/existing-containerd-shim-config"), }, false, }, diff --git a/pkg/containerd/configure_test.go b/pkg/containerd/configure_test.go index e40944c..0f1625d 100644 --- a/pkg/containerd/configure_test.go +++ b/pkg/containerd/configure_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/spf13/afero" - "github.com/spinkube/runtime-class-manager/tests" + tests "github.com/spinkube/runtime-class-manager/tests/node-installer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -41,7 +41,7 @@ func TestConfig_AddRuntime(t *testing.T) { wantFileContent string }{ {"missing shim config", fields{ - hostFs: tests.FixtureFs("../../testdata/containerd/missing-containerd-shim-config"), + hostFs: tests.FixtureFs("../../testdata/node-installer/containerd/missing-containerd-shim-config"), configPath: "/etc/containerd/config.toml", }, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, false, `[plugins] [plugins."io.containerd.monitor.v1.cgroups"] @@ -66,11 +66,11 @@ func TestConfig_AddRuntime(t *testing.T) { runtime_type = "/opt/kwasm/bin/containerd-shim-spin-v1" `}, {"missing config", fields{ - hostFs: tests.FixtureFs("../../testdata/containerd/missing-containerd-config"), + hostFs: tests.FixtureFs("../../testdata/node-installer/containerd/missing-containerd-config"), configPath: "/etc/containerd/config.toml", }, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, true, ``}, {"existing shim config", fields{ - hostFs: tests.FixtureFs("../../testdata/containerd/existing-containerd-shim-config"), + hostFs: tests.FixtureFs("../../testdata/node-installer/containerd/existing-containerd-shim-config"), configPath: "/etc/containerd/config.toml", }, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, false, `[plugins] [plugins."io.containerd.monitor.v1.cgroups"] @@ -134,7 +134,7 @@ func TestConfig_RemoveRuntime(t *testing.T) { wantFileContent string }{ {"missing shim config", fields{ - hostFs: tests.FixtureFs("../../testdata/containerd/missing-containerd-shim-config"), + hostFs: tests.FixtureFs("../../testdata/node-installer/containerd/missing-containerd-shim-config"), configPath: "/etc/containerd/config.toml", }, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, false, `[plugins] [plugins."io.containerd.monitor.v1.cgroups"] @@ -155,11 +155,11 @@ func TestConfig_RemoveRuntime(t *testing.T) { rdt_config_file = "" `}, {"missing config", fields{ - hostFs: tests.FixtureFs("../../testdata/containerd/missing-containerd-config"), + hostFs: tests.FixtureFs("../../testdata/node-installer/containerd/missing-containerd-config"), configPath: "/etc/containerd/config.toml", }, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, true, ``}, {"existing shim config", fields{ - hostFs: tests.FixtureFs("../../testdata/containerd/existing-containerd-shim-config"), + hostFs: tests.FixtureFs("../../testdata/node-installer/containerd/existing-containerd-shim-config"), configPath: "/etc/containerd/config.toml", }, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, false, `[plugins] [plugins."io.containerd.monitor.v1.cgroups"] diff --git a/pkg/shim/install_test.go b/pkg/shim/install_test.go index 220e8a9..ff8e09a 100644 --- a/pkg/shim/install_test.go +++ b/pkg/shim/install_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/spf13/afero" - "github.com/spinkube/runtime-class-manager/tests" + tests "github.com/spinkube/runtime-class-manager/tests/node-installer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -49,8 +49,8 @@ func TestConfig_Install(t *testing.T) { { "no changes to shim", fields{ - tests.FixtureFs("../../testdata"), - tests.FixtureFs("../../testdata/shim"), + tests.FixtureFs("../../testdata/node-installer"), + tests.FixtureFs("../../testdata/node-installer/shim"), "/assets", "/opt/kwasm", }, @@ -64,8 +64,8 @@ func TestConfig_Install(t *testing.T) { { "install new shim over old", fields{ - tests.FixtureFs("../../testdata"), - tests.FixtureFs("../../testdata/shim"), + tests.FixtureFs("../../testdata/node-installer"), + tests.FixtureFs("../../testdata/node-installer/shim"), "/assets", "/opt/kwasm", }, @@ -80,7 +80,7 @@ func TestConfig_Install(t *testing.T) { "unable to find new shim", fields{ afero.NewMemMapFs(), - tests.FixtureFs("../../testdata/shim"), + tests.FixtureFs("../../testdata/node-installer/shim"), "/assets", "/opt/kwasm", }, @@ -94,8 +94,8 @@ func TestConfig_Install(t *testing.T) { { "unable to write to hostFs", fields{ - tests.FixtureFs("../../testdata"), - afero.NewReadOnlyFs(tests.FixtureFs("../../testdata/shim")), + tests.FixtureFs("../../testdata/node-installer"), + afero.NewReadOnlyFs(tests.FixtureFs("../../testdata/node-installer/shim")), "/assets", "/opt/kwasm", }, diff --git a/pkg/state/state_test.go b/pkg/state/state_test.go index 7fd67af..bb6089d 100644 --- a/pkg/state/state_test.go +++ b/pkg/state/state_test.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/afero" "github.com/spinkube/runtime-class-manager/pkg/state" - "github.com/spinkube/runtime-class-manager/tests" + tests "github.com/spinkube/runtime-class-manager/tests/node-installer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -24,7 +24,7 @@ func TestGet(t *testing.T) { { "existing state", args{ - tests.FixtureFs("../../testdata/containerd/existing-containerd-shim-config"), + tests.FixtureFs("../../testdata/node-installer/containerd/existing-containerd-shim-config"), "/opt/kwasm", }, &state.State{ @@ -40,7 +40,7 @@ func TestGet(t *testing.T) { { "missing state", args{ - tests.FixtureFs("../../testdata/containerd/missing-containerd-shim-config"), + tests.FixtureFs("../../testdata/node-installer/containerd/missing-containerd-shim-config"), "/opt/kwasm", }, &state.State{ diff --git a/testdata/assets/containerd-shim-slight-v1 b/testdata/node-installer/assets/containerd-shim-slight-v1 similarity index 100% rename from testdata/assets/containerd-shim-slight-v1 rename to testdata/node-installer/assets/containerd-shim-slight-v1 diff --git a/testdata/assets/containerd-shim-spin-v1 b/testdata/node-installer/assets/containerd-shim-spin-v1 similarity index 100% rename from testdata/assets/containerd-shim-spin-v1 rename to testdata/node-installer/assets/containerd-shim-spin-v1 diff --git a/testdata/containerd/existing-containerd-shim-config/etc/containerd/config.toml b/testdata/node-installer/containerd/existing-containerd-shim-config/etc/containerd/config.toml similarity index 100% rename from testdata/containerd/existing-containerd-shim-config/etc/containerd/config.toml rename to testdata/node-installer/containerd/existing-containerd-shim-config/etc/containerd/config.toml diff --git a/testdata/containerd/existing-containerd-shim-config/opt/kwasm/bin/containerd-shim-spin-v1 b/testdata/node-installer/containerd/existing-containerd-shim-config/opt/kwasm/bin/containerd-shim-spin-v1 similarity index 100% rename from testdata/containerd/existing-containerd-shim-config/opt/kwasm/bin/containerd-shim-spin-v1 rename to testdata/node-installer/containerd/existing-containerd-shim-config/opt/kwasm/bin/containerd-shim-spin-v1 diff --git a/testdata/containerd/existing-containerd-shim-config/opt/kwasm/kwasm-lock.json b/testdata/node-installer/containerd/existing-containerd-shim-config/opt/kwasm/kwasm-lock.json similarity index 100% rename from testdata/containerd/existing-containerd-shim-config/opt/kwasm/kwasm-lock.json rename to testdata/node-installer/containerd/existing-containerd-shim-config/opt/kwasm/kwasm-lock.json diff --git a/testdata/containerd/missing-containerd-config/etc/containerd/.gitkeep b/testdata/node-installer/containerd/missing-containerd-config/etc/containerd/.gitkeep similarity index 100% rename from testdata/containerd/missing-containerd-config/etc/containerd/.gitkeep rename to testdata/node-installer/containerd/missing-containerd-config/etc/containerd/.gitkeep diff --git a/testdata/containerd/missing-containerd-shim-config/etc/containerd/config.toml b/testdata/node-installer/containerd/missing-containerd-shim-config/etc/containerd/config.toml similarity index 100% rename from testdata/containerd/missing-containerd-shim-config/etc/containerd/config.toml rename to testdata/node-installer/containerd/missing-containerd-shim-config/etc/containerd/config.toml diff --git a/testdata/shim/opt/kwasm/bin/containerd-shim-spin-v1 b/testdata/node-installer/shim/opt/kwasm/bin/containerd-shim-spin-v1 similarity index 100% rename from testdata/shim/opt/kwasm/bin/containerd-shim-spin-v1 rename to testdata/node-installer/shim/opt/kwasm/bin/containerd-shim-spin-v1 diff --git a/testdata/shim/opt/kwasm/kwasm-lock.json b/testdata/node-installer/shim/opt/kwasm/kwasm-lock.json similarity index 100% rename from testdata/shim/opt/kwasm/kwasm-lock.json rename to testdata/node-installer/shim/opt/kwasm/kwasm-lock.json diff --git a/tests/fs.go b/tests/node-installer/fs.go similarity index 100% rename from tests/fs.go rename to tests/node-installer/fs.go