From 77a2af8817284d134ea1f30f0b06291a5b05c5a0 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Mon, 23 Mar 2020 10:27:32 -0700 Subject: Combine GlobalFlags and EngineFlags into EngineOptions * EngineOptions obtained in command via `opt, err := registry.Options(cmd)` Signed-off-by: Jhon Honce --- pkg/domain/entities/engine.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pkg/domain/entities/engine.go') diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go index 08ef1df92..8553f5326 100644 --- a/pkg/domain/entities/engine.go +++ b/pkg/domain/entities/engine.go @@ -19,16 +19,12 @@ func (m EngineMode) String() string { return string(m) } -// FIXME: merge EngineOptions and EngineFlags type EngineOptions struct { Uri string Identities []string FlagSet *pflag.FlagSet - Flags EngineFlags EngineMode EngineMode -} -type EngineFlags struct { CGroupManager string CniConfigDir string ConmonPath string @@ -61,9 +57,9 @@ type EngineFlags struct { IgnoreHosts bool } -func NewEngineOptions() (EngineFlags, error) { +func NewEngineOptions() (EngineOptions, error) { u, _ := user.Current() - return EngineFlags{ + return EngineOptions{ CGroupManager: define.SystemdCgroupsManager, CniConfigDir: "", Config: "", -- cgit v1.2.3-54-g00ecf