resmgr: move/generate resmgr API/types to pkg/apis.

Move resmgr API and types to pkg/apis/resmgr/v1alpha1, next to other generated APIs (currently config). This allows annotating the types for better CRD validation which is useful if we use them in our config CRDs. Signed-off-by: Krisztian Litkey <[email protected]>
containers · Feb 13, 2024 · 754b485 · 754b485
1 parent 6467120
commit 754b485
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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 → pkg/apis/resmgr/v1alpha1/expression.go b/pkg/resmgr/apis/expression.go → pkg/apis/resmgr/v1alpha1/expression.go
diff --git a/pkg/resmgr/apis/expression_test.go → pkg/apis/resmgr/v1alpha1/expression_test.go b/pkg/resmgr/apis/expression_test.go → pkg/apis/resmgr/v1alpha1/expression_test.go
diff --git 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
@@ -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
@@ -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
@@ -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.