From 638b94c5987a78d3f1c858d4354077d63db5e37e Mon Sep 17 00:00:00 2001 From: zwzhang Date: Fri, 17 Nov 2023 14:08:47 +0800 Subject: [PATCH] copilot-agent: rename dir as copilot-agent (#56) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 佑祎 --- Makefile | 2 +- cmd/{yarn-copilot => yarn-copilot-agent}/main.go | 6 +++--- cmd/{yarn-copilot => yarn-copilot-agent}/options/options.go | 0 ...arn-copilot.dockerfile => yarn-copilot-agent.dockerfile} | 2 +- pkg/{copilot => copilot-agent}/nm/nm.go | 2 +- pkg/{copilot => copilot-agent}/nm/nm_pod_discover.go | 0 pkg/{copilot => copilot-agent}/nm/types.go | 0 pkg/{copilot => copilot-agent}/runtime/manager.go | 0 pkg/{copilot => copilot-agent}/runtime/runtime.go | 0 pkg/{copilot => copilot-agent}/server/helper.go | 2 +- pkg/{copilot => copilot-agent}/server/server.go | 2 +- pkg/{copilot => copilot-agent}/utils/cgroup_unsupported.go | 0 pkg/{copilot => copilot-agent}/utils/cgroups_linux.go | 0 pkg/{copilot => copilot-agent}/utils/utils.go | 0 14 files changed, 8 insertions(+), 8 deletions(-) rename cmd/{yarn-copilot => yarn-copilot-agent}/main.go (92%) rename cmd/{yarn-copilot => yarn-copilot-agent}/options/options.go (100%) rename docker/{yarn-copilot.dockerfile => yarn-copilot-agent.dockerfile} (94%) rename pkg/{copilot => copilot-agent}/nm/nm.go (99%) rename pkg/{copilot => copilot-agent}/nm/nm_pod_discover.go (100%) rename pkg/{copilot => copilot-agent}/nm/types.go (100%) rename pkg/{copilot => copilot-agent}/runtime/manager.go (100%) rename pkg/{copilot => copilot-agent}/runtime/runtime.go (100%) rename pkg/{copilot => copilot-agent}/server/helper.go (96%) rename pkg/{copilot => copilot-agent}/server/server.go (98%) rename pkg/{copilot => copilot-agent}/utils/cgroup_unsupported.go (100%) rename pkg/{copilot => copilot-agent}/utils/cgroups_linux.go (100%) rename pkg/{copilot => copilot-agent}/utils/utils.go (100%) diff --git a/Makefile b/Makefile index 6250070c..3d4f86f8 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ build: build-yarn-operator .PHONY: build-yarn-copilot build-yarn-copilot: ## Build yarn-copilot binary. - go build -o bin/yarn-copilot cmd/yarn-copilot/main.go + go build -o bin/yarn-copilot cmd/yarn-copilot-agent/main.go .PHONY: build-yarn-operator build-yarn-operator: ## Build yarn-operator binary. diff --git a/cmd/yarn-copilot/main.go b/cmd/yarn-copilot-agent/main.go similarity index 92% rename from cmd/yarn-copilot/main.go rename to cmd/yarn-copilot-agent/main.go index cafa6d21..0cff58d1 100644 --- a/cmd/yarn-copilot/main.go +++ b/cmd/yarn-copilot-agent/main.go @@ -25,9 +25,9 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/manager/signals" - "github.com/koordinator-sh/goyarn/cmd/yarn-copilot/options" - "github.com/koordinator-sh/goyarn/pkg/copilot/nm" - "github.com/koordinator-sh/goyarn/pkg/copilot/server" + "github.com/koordinator-sh/goyarn/cmd/yarn-copilot-agent/options" + "github.com/koordinator-sh/goyarn/pkg/copilot-agent/nm" + "github.com/koordinator-sh/goyarn/pkg/copilot-agent/server" ) func main() { diff --git a/cmd/yarn-copilot/options/options.go b/cmd/yarn-copilot-agent/options/options.go similarity index 100% rename from cmd/yarn-copilot/options/options.go rename to cmd/yarn-copilot-agent/options/options.go diff --git a/docker/yarn-copilot.dockerfile b/docker/yarn-copilot-agent.dockerfile similarity index 94% rename from docker/yarn-copilot.dockerfile rename to docker/yarn-copilot-agent.dockerfile index 99d07d67..e54cab35 100644 --- a/docker/yarn-copilot.dockerfile +++ b/docker/yarn-copilot-agent.dockerfile @@ -9,7 +9,7 @@ RUN go mod download COPY cmd/ cmd/ COPY pkg/ pkg/ -RUN GOOS=linux GOARCH=amd64 go build -a -o koord-yarn-copilot cmd/yarn-copilot/main.go +RUN GOOS=linux GOARCH=amd64 go build -a -o koord-yarn-copilot cmd/yarn-copilot-agent/main.go FROM nvidia/cuda:11.2.2-base-ubuntu20.04 RUN apt-get add --update bash net-tools iproute2 logrotate less rsync util-linux lvm2 diff --git a/pkg/copilot/nm/nm.go b/pkg/copilot-agent/nm/nm.go similarity index 99% rename from pkg/copilot/nm/nm.go rename to pkg/copilot-agent/nm/nm.go index 2ca87cd2..3c51dbf9 100644 --- a/pkg/copilot/nm/nm.go +++ b/pkg/copilot-agent/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/copilot/utils" + "github.com/koordinator-sh/goyarn/pkg/copilot-agent/utils" ) const ( diff --git a/pkg/copilot/nm/nm_pod_discover.go b/pkg/copilot-agent/nm/nm_pod_discover.go similarity index 100% rename from pkg/copilot/nm/nm_pod_discover.go rename to pkg/copilot-agent/nm/nm_pod_discover.go diff --git a/pkg/copilot/nm/types.go b/pkg/copilot-agent/nm/types.go similarity index 100% rename from pkg/copilot/nm/types.go rename to pkg/copilot-agent/nm/types.go diff --git a/pkg/copilot/runtime/manager.go b/pkg/copilot-agent/runtime/manager.go similarity index 100% rename from pkg/copilot/runtime/manager.go rename to pkg/copilot-agent/runtime/manager.go diff --git a/pkg/copilot/runtime/runtime.go b/pkg/copilot-agent/runtime/runtime.go similarity index 100% rename from pkg/copilot/runtime/runtime.go rename to pkg/copilot-agent/runtime/runtime.go diff --git a/pkg/copilot/server/helper.go b/pkg/copilot-agent/server/helper.go similarity index 96% rename from pkg/copilot/server/helper.go rename to pkg/copilot-agent/server/helper.go index 2f8d0315..72b032c6 100644 --- a/pkg/copilot/server/helper.go +++ b/pkg/copilot-agent/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/copilot/nm" + "github.com/koordinator-sh/goyarn/pkg/copilot-agent/nm" ) func ParseContainerInfo(yarnContainer *nm.YarnContainer, op *nm.NodeMangerOperator) *ContainerInfo { diff --git a/pkg/copilot/server/server.go b/pkg/copilot-agent/server/server.go similarity index 98% rename from pkg/copilot/server/server.go rename to pkg/copilot-agent/server/server.go index 6c33fbb0..cab1000d 100644 --- a/pkg/copilot/server/server.go +++ b/pkg/copilot-agent/server/server.go @@ -30,7 +30,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/klog/v2" - "github.com/koordinator-sh/goyarn/pkg/copilot/nm" + "github.com/koordinator-sh/goyarn/pkg/copilot-agent/nm" ) type YarnCopilotServer struct { diff --git a/pkg/copilot/utils/cgroup_unsupported.go b/pkg/copilot-agent/utils/cgroup_unsupported.go similarity index 100% rename from pkg/copilot/utils/cgroup_unsupported.go rename to pkg/copilot-agent/utils/cgroup_unsupported.go diff --git a/pkg/copilot/utils/cgroups_linux.go b/pkg/copilot-agent/utils/cgroups_linux.go similarity index 100% rename from pkg/copilot/utils/cgroups_linux.go rename to pkg/copilot-agent/utils/cgroups_linux.go diff --git a/pkg/copilot/utils/utils.go b/pkg/copilot-agent/utils/utils.go similarity index 100% rename from pkg/copilot/utils/utils.go rename to pkg/copilot-agent/utils/utils.go