Fix conflicts

Netcracker · Jan 11, 2022 · 9098561 · 9098561
1 parent 613f242
commit 9098561
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/kubemarine/plugins/__init__.py b/kubemarine/plugins/__init__.py
@@ -30,11 +30,12 @@
 
 import yaml
 
+from core.cluster import KubernetesCluster
 from kubemarine import jinja, thirdparties
 from kubemarine.core import utils
 from kubemarine.core.executor import RemoteExecutor
 from kubemarine.core.yaml_merger import default_merger
-from kubemarine.core.group import NodeGroup
+from kubemarine.core.group import NodeGroup, NodeGroupResult
 
 # list of plugins owned and managed by kubemarine
 oob_plugins = [

diff --git a/kubemarine/system.py b/kubemarine/system.py
@@ -23,6 +23,7 @@
 import fabric
 import yaml
 
+from core.annotations import restrict_empty_group
 from kubemarine import selinux, kubernetes, packages
 from kubemarine.core import utils
 from kubemarine.core.cluster import KubernetesCluster