From f0278f41d71db478cbbf273e1618832a33e55fe5 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Wed, 6 Sep 2023 17:56:01 +0200 Subject: [PATCH] runtime/virtiofsd: Drop all references to "--cache=none" This syntax belongs to the legacy C virtiofsd implementation that we don't support anymore since kata-containers 3.1.3 because of other API breaking changes. People have been warned to switch from "none" to "never" since kata-containers 2.5.2. Let's officially do that. The compat code that would convert "none" to "never" isn't needed anymore. Just drop it. Fixes #7864 Signed-off-by: Greg Kurz (cherry picked from commit 72c510d057a21d96628ce4b2b12bfa3b31bec99c) Signed-off-by: Greg Kurz --- src/runtime/virtcontainers/virtiofsd.go | 4 ---- src/runtime/virtcontainers/virtiofsd_test.go | 13 ++++--------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/runtime/virtcontainers/virtiofsd.go b/src/runtime/virtcontainers/virtiofsd.go index 3e02756eb3..0a62646847 100644 --- a/src/runtime/virtcontainers/virtiofsd.go +++ b/src/runtime/virtcontainers/virtiofsd.go @@ -39,7 +39,6 @@ var ( const ( typeVirtioFSCacheModeNever = "never" - typeVirtioFSCacheModeNone = "none" typeVirtioFSCacheModeAlways = "always" typeVirtioFSCacheModeAuto = "auto" ) @@ -219,9 +218,6 @@ func (v *virtiofsd) valid() error { if v.cache == "" { v.cache = typeVirtioFSCacheModeAuto - } else if v.cache == typeVirtioFSCacheModeNone { - v.Logger().Warn("virtio-fs cache mode `none` is deprecated since Kata Containers 2.5.0 and will be removed in the future release, please use `never` instead. For more details please refer to https://github.com/kata-containers/kata-containers/issues/4234.") - v.cache = typeVirtioFSCacheModeNever } else if v.cache != typeVirtioFSCacheModeAuto && v.cache != typeVirtioFSCacheModeAlways && v.cache != typeVirtioFSCacheModeNever { return errVirtiofsdInvalidVirtiofsCacheMode(v.cache) } diff --git a/src/runtime/virtcontainers/virtiofsd_test.go b/src/runtime/virtcontainers/virtiofsd_test.go index c7d1e1e784..d44a523e6e 100644 --- a/src/runtime/virtcontainers/virtiofsd_test.go +++ b/src/runtime/virtcontainers/virtiofsd_test.go @@ -76,15 +76,15 @@ func TestVirtiofsdArgs(t *testing.T) { v := &virtiofsd{ path: "/usr/bin/virtiofsd", sourcePath: "/run/kata-shared/foo", - cache: "none", + cache: "never", } - expected := "--syslog --cache=none --shared-dir=/run/kata-shared/foo --fd=123" + expected := "--syslog --cache=never --shared-dir=/run/kata-shared/foo --fd=123" args, err := v.args(123) assert.NoError(err) assert.Equal(expected, strings.Join(args, " ")) - expected = "--syslog --cache=none --shared-dir=/run/kata-shared/foo --fd=456" + expected = "--syslog --cache=never --shared-dir=/run/kata-shared/foo --fd=456" args, err = v.args(456) assert.NoError(err) assert.Equal(expected, strings.Join(args, " ")) @@ -130,12 +130,7 @@ func TestValid(t *testing.T) { {"source is not available", func(v *virtiofsd) { v.sourcePath = "/foo/bar" }, errVirtiofsdSourceNotAvailable, nil}, - {"replace cache mode none by never", func(v *virtiofsd) { - v.cache = "none" - }, nil, func(name string, a *assert.Assertions, v *virtiofsd) { - a.Equal("never", v.cache, "test case %+s, cache mode none should be replaced by never", name) - }}, - {"invald cache mode: replace none by never", func(v *virtiofsd) { + {"invalid cache mode", func(v *virtiofsd) { v.cache = "foo" }, errVirtiofsdInvalidVirtiofsCacheMode("foo"), nil}, }