chores: refactor some pkg dir names (koordinator-sh#43)

Signed-off-by: 佑祎 <[email protected]>
zwzhang0107 · Oct 25, 2023 · 8e3b56e · 8e3b56e
1 parent 2d18d35
commit 8e3b56e
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 14 deletions.
diff --git a/cmd/yarn-copilot/main.go b/cmd/yarn-copilot/main.go
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 
 	"github.com/koordinator-sh/goyarn/cmd/yarn-copilot/options"
-	"github.com/koordinator-sh/goyarn/pkg/yarn/copilot/nm"
-	"github.com/koordinator-sh/goyarn/pkg/yarn/copilot/server"
+	"github.com/koordinator-sh/goyarn/pkg/copilot/nm"
+	"github.com/koordinator-sh/goyarn/pkg/copilot/server"
 )
 
 func main() {

diff --git a/...controller/noderesource/yarn_collector.go → pkg/controller/metrics/yarn_collector.go b/...controller/noderesource/yarn_collector.go → pkg/controller/metrics/yarn_collector.go
@@ -14,14 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package noderesource
+package metrics
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/koordinator-sh/goyarn/pkg/yarn/cache"
 )
 
+const (
+	yarnNodeCPUResource             = "yarn_node_cpu_resource"
+	yarnNodeMemoryResource          = "yarn_node_memory_resource"
+	yarnNodeCPUAllocatedResource    = "yarn_node_cpu_allocated_resource"
+	yarnNodeMemoryAllocatedResource = "yarn_node_memory_allocated_resource"
+)
+
 var (
 	yarnNodeCPUMetric = prometheus.NewDesc(
 		yarnNodeCPUResource,

diff --git a/pkg/controller/noderesource/resource_sync_controller.go b/pkg/controller/noderesource/resource_sync_controller.go
@@ -35,6 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	yarnmetrics "github.com/koordinator-sh/goyarn/pkg/controller/metrics"
 	"github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn"
 	yarnserver "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn/server"
 	"github.com/koordinator-sh/goyarn/pkg/yarn/cache"
@@ -192,7 +193,7 @@ func Add(mgr ctrl.Manager) error {
 	}
 	yarnNodesSyncer := cache.NewNodesSyncer(clients)
 	go yarnNodesSyncer.Sync()
-	coll := NewYarnMetricCollector(yarnNodesSyncer)
+	coll := yarnmetrics.NewYarnMetricCollector(yarnNodesSyncer)
 	if err = metrics.Registry.Register(coll); err != nil {
 		return err
 	}

diff --git a/pkg/controller/noderesource/yarn_resource.go b/pkg/controller/noderesource/yarn_resource.go
@@ -34,13 +34,6 @@ const (
 	nodeOriginAllocatableAnnotationKey     = "node.koordinator.sh/originAllocatable"
 )
 
-const (
-	yarnNodeCPUResource             = "yarn_node_cpu_resource"
-	yarnNodeMemoryResource          = "yarn_node_memory_resource"
-	yarnNodeCPUAllocatedResource    = "yarn_node_cpu_allocated_resource"
-	yarnNodeMemoryAllocatedResource = "yarn_node_memory_allocated_resource"
-)
-
 func calculate(batchCPU resource.Quantity, batchMemory resource.Quantity) (int64, int64) {
 	// TODO multiple ratio as buffer
 	return batchCPU.ScaledValue(resource.Kilo), batchMemory.ScaledValue(resource.Mega)

diff --git a/pkg/yarn/copilot/nm/nm.go → pkg/copilot/nm/nm.go b/pkg/yarn/copilot/nm/nm.go → pkg/copilot/nm/nm.go
@@ -31,7 +31,7 @@ import (
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/util/system"
 	"k8s.io/klog/v2"
 
-	"github.com/koordinator-sh/goyarn/pkg/yarn/copilot/utils"
+	"github.com/koordinator-sh/goyarn/pkg/copilot/utils"
 )
 
 const (

diff --git a/pkg/yarn/copilot/nm/nm_pod_discover.go → pkg/copilot/nm/nm_pod_discover.go b/pkg/yarn/copilot/nm/nm_pod_discover.go → pkg/copilot/nm/nm_pod_discover.go
diff --git a/pkg/yarn/copilot/nm/types.go → pkg/copilot/nm/types.go b/pkg/yarn/copilot/nm/types.go → pkg/copilot/nm/types.go
diff --git a/pkg/yarn/copilot/runtime/manager.go → pkg/copilot/runtime/manager.go b/pkg/yarn/copilot/runtime/manager.go → pkg/copilot/runtime/manager.go
diff --git a/pkg/yarn/copilot/runtime/runtime.go → pkg/copilot/runtime/runtime.go b/pkg/yarn/copilot/runtime/runtime.go → pkg/copilot/runtime/runtime.go
diff --git a/pkg/yarn/copilot/server/helper.go → pkg/copilot/server/helper.go b/pkg/yarn/copilot/server/helper.go → pkg/copilot/server/helper.go
@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 
-	"github.com/koordinator-sh/goyarn/pkg/yarn/copilot/nm"
+	"github.com/koordinator-sh/goyarn/pkg/copilot/nm"
 )
 
 func ParseContainerInfo(yarnContainer *nm.YarnContainer, op *nm.NodeMangerOperator) *ContainerInfo {

diff --git a/pkg/yarn/copilot/server/server.go → pkg/copilot/server/server.go b/pkg/yarn/copilot/server/server.go → pkg/copilot/server/server.go
@@ -30,7 +30,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/klog/v2"
 
-	"github.com/koordinator-sh/goyarn/pkg/yarn/copilot/nm"
+	"github.com/koordinator-sh/goyarn/pkg/copilot/nm"
 )
 
 type YarnCopilotServer struct {

diff --git a/pkg/yarn/copilot/utils/cgroup_unsupported.go → pkg/copilot/utils/cgroup_unsupported.go b/pkg/yarn/copilot/utils/cgroup_unsupported.go → pkg/copilot/utils/cgroup_unsupported.go
diff --git a/pkg/yarn/copilot/utils/cgroups_linux.go → pkg/copilot/utils/cgroups_linux.go b/pkg/yarn/copilot/utils/cgroups_linux.go → pkg/copilot/utils/cgroups_linux.go
diff --git a/pkg/yarn/copilot/utils/utils.go → pkg/copilot/utils/utils.go b/pkg/yarn/copilot/utils/utils.go → pkg/copilot/utils/utils.go