diff --git a/cmd/plugins/topology-aware/policy/affinity.go b/cmd/plugins/topology-aware/policy/affinity.go index 500628fdc..21c38309d 100644 --- a/cmd/plugins/topology-aware/policy/affinity.go +++ b/cmd/plugins/topology-aware/policy/affinity.go @@ -15,7 +15,7 @@ package topologyaware import ( - resmgr "github.com/containers/nri-plugins/pkg/resmgr/apis" + resmgr "github.com/containers/nri-plugins/pkg/apis/resmgr/v1alpha1" "github.com/containers/nri-plugins/pkg/resmgr/cache" ) diff --git a/cmd/plugins/topology-aware/policy/mocks_test.go b/cmd/plugins/topology-aware/policy/mocks_test.go index 80471bb93..8d474e41a 100644 --- a/cmd/plugins/topology-aware/policy/mocks_test.go +++ b/cmd/plugins/topology-aware/policy/mocks_test.go @@ -19,7 +19,7 @@ import ( "time" nri "github.com/containerd/nri/pkg/api" - resmgr "github.com/containers/nri-plugins/pkg/resmgr/apis" + resmgr "github.com/containers/nri-plugins/pkg/apis/resmgr/v1alpha1" "github.com/containers/nri-plugins/pkg/resmgr/cache" system "github.com/containers/nri-plugins/pkg/sysfs" "github.com/containers/nri-plugins/pkg/topology" diff --git a/pkg/resmgr/apis/expression.go b/pkg/apis/resmgr/v1alpha1/expression.go similarity index 100% rename from pkg/resmgr/apis/expression.go rename to pkg/apis/resmgr/v1alpha1/expression.go diff --git a/pkg/resmgr/apis/expression_test.go b/pkg/apis/resmgr/v1alpha1/expression_test.go similarity index 100% rename from pkg/resmgr/apis/expression_test.go rename to pkg/apis/resmgr/v1alpha1/expression_test.go diff --git a/pkg/resmgr/cache/affinity.go b/pkg/resmgr/cache/affinity.go index 9d2dbac0a..79eb9803b 100644 --- a/pkg/resmgr/cache/affinity.go +++ b/pkg/resmgr/cache/affinity.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/yaml" + resmgr "github.com/containers/nri-plugins/pkg/apis/resmgr/v1alpha1" "github.com/containers/nri-plugins/pkg/kubernetes" - resmgr "github.com/containers/nri-plugins/pkg/resmgr/apis" ) const ( diff --git a/pkg/resmgr/cache/cache.go b/pkg/resmgr/cache/cache.go index 844d3cdc5..579e6dd89 100644 --- a/pkg/resmgr/cache/cache.go +++ b/pkg/resmgr/cache/cache.go @@ -28,9 +28,9 @@ import ( "github.com/containers/nri-plugins/pkg/utils/cpuset" + resmgr "github.com/containers/nri-plugins/pkg/apis/resmgr/v1alpha1" "github.com/containers/nri-plugins/pkg/kubernetes" logger "github.com/containers/nri-plugins/pkg/log" - resmgr "github.com/containers/nri-plugins/pkg/resmgr/apis" "github.com/containers/nri-plugins/pkg/topology" ) diff --git a/pkg/resmgr/cache/container.go b/pkg/resmgr/cache/container.go index 8145c3936..0b9f6b1d9 100644 --- a/pkg/resmgr/cache/container.go +++ b/pkg/resmgr/cache/container.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" + resmgr "github.com/containers/nri-plugins/pkg/apis/resmgr/v1alpha1" "github.com/containers/nri-plugins/pkg/cgroups" "github.com/containers/nri-plugins/pkg/kubernetes" - resmgr "github.com/containers/nri-plugins/pkg/resmgr/apis" "github.com/containers/nri-plugins/pkg/topology" nri "github.com/containerd/nri/pkg/api" diff --git a/pkg/resmgr/cache/pod.go b/pkg/resmgr/cache/pod.go index f5496e811..2acd8f3c7 100644 --- a/pkg/resmgr/cache/pod.go +++ b/pkg/resmgr/cache/pod.go @@ -20,9 +20,9 @@ import ( nri "github.com/containerd/nri/pkg/api" v1 "k8s.io/api/core/v1" + resmgr "github.com/containers/nri-plugins/pkg/apis/resmgr/v1alpha1" "github.com/containers/nri-plugins/pkg/cgroups" "github.com/containers/nri-plugins/pkg/kubernetes" - resmgr "github.com/containers/nri-plugins/pkg/resmgr/apis" ) // Create and initialize a cached pod.