From 6563544fdbca553683bc3e8154c342297d66cc0e Mon Sep 17 00:00:00 2001 From: zwzhang Date: Fri, 17 Nov 2023 14:26:03 +0800 Subject: [PATCH] chores: change repo name to yarn-copilot (#57) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 佑祎 --- README-zh_CN.md | 15 ++++++++------- README.md | 14 +++++++------- cmd/yarn-copilot-agent/main.go | 6 +++--- cmd/yarn-operator/main.go | 2 +- cmd/yarn-operator/options/controllers.go | 2 +- docker/yarn-copilot-agent.dockerfile | 4 ++-- docker/yarn-operator.dockerfile | 4 ++-- go.mod | 2 +- hack/generate-yarn.sh | 4 ++-- hack/mock-gen.sh | 2 +- pkg/controller/metrics/yarn_collector.go | 2 +- .../noderesource/resource_sync_controller.go | 10 +++++----- .../noderesource/resource_sync_controller_test.go | 6 +++--- pkg/copilot-agent/nm/nm.go | 2 +- pkg/copilot-agent/server/helper.go | 2 +- pkg/copilot-agent/server/server.go | 2 +- pkg/yarn/apis/auth/auth.go | 2 +- .../hadoopyarn/applicationclient_protocol.pb.go | 2 +- ...rn_server_resourcemanager_service_protos.pb.go | 2 +- pkg/yarn/apis/proto/hadoopyarn/yarn_protos.pb.go | 2 +- .../proto/hadoopyarn/yarn_service_protos.pb.go | 2 +- pkg/yarn/apis/security/digestmd5.go | 2 +- pkg/yarn/apis/security/ugi.go | 2 +- .../apis/service/applicationclient_service.go | 8 ++++---- pkg/yarn/apis/service/ha_service.go | 6 +++--- .../resourcemanager_administration_service.go | 8 ++++---- pkg/yarn/cache/nodes_syncer.go | 4 ++-- pkg/yarn/client/application_client.go | 6 +++--- pkg/yarn/client/client.go | 8 ++++---- .../client/examples/ha-get-service-status/main.go | 6 +++--- .../examples/rm-get-cluster-nodes-with-ha/main.go | 4 ++-- .../rm-update-node-resource-with-ha/main.go | 6 +++--- .../examples/rm-update-node-resource/main.go | 8 ++++---- pkg/yarn/client/ha_service_client.go | 4 ++-- pkg/yarn/client/ipc/client.go | 6 +++--- pkg/yarn/client/mockclient/mock_client.go | 4 ++-- pkg/yarn/client/mockclient/mock_factory.go | 2 +- pkg/yarn/client/rm_admin_client.go | 6 +++--- 38 files changed, 90 insertions(+), 89 deletions(-) diff --git a/README-zh_CN.md b/README-zh_CN.md index fbfa70c1..2f0ccad7 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -1,13 +1,13 @@

-

Koordinator goyarn

+

Koordinator YARN Copilot

Koordinator

[![License](https://img.shields.io/github/license/koordinator-sh/koordinator.svg?color=4EB1BA&style=flat-square)](https://opensource.org/licenses/Apache-2.0) -[![GitHub release](https://img.shields.io/github/v/release/koordinator-sh/goyarn.svg?style=flat-square)](https://github.com/koordinator-sh/goyarn/releases/latest) -[![CI](https://img.shields.io/github/actions/workflow/status/koordinator-sh/goyarn/ci.yaml?label=CI&logo=github&style=flat-square&branch=main)](https://github.com/koordinator-sh/goyarn/actions/workflows/ci.yaml) -[![Go Report Card](https://goreportcard.com/badge/github.com/koordinator-sh/goyarn?style=flat-square)](https://goreportcard.com/report/github.com/koordinator-sh/goyarn) -[![codecov](https://img.shields.io/codecov/c/github/koordinator-sh/goyarn?logo=codecov&style=flat-square)](https://codecov.io/github/koordinator-sh/goyarn) +[![GitHub release](https://img.shields.io/github/v/release/koordinator-sh/yarn-copilot.svg?style=flat-square)](https://github.com/koordinator-sh/yarn-copilot/releases/latest) +[![CI](https://img.shields.io/github/actions/workflow/status/koordinator-sh/yarn-copilot/ci.yaml?label=CI&logo=github&style=flat-square&branch=main)](https://github.com/koordinator-sh/yarn-copilot/actions/workflows/ci.yaml) +[![Go Report Card](https://goreportcard.com/badge/github.com/koordinator-sh/yarn-copilot?style=flat-square)](https://goreportcard.com/report/github.com/koordinator-sh/yarn-copilot) +[![codecov](https://img.shields.io/codecov/c/github/koordinator-sh/yarn-copilot?logo=codecov&style=flat-square)](https://codecov.io/github/koordinator-sh/yarn-copilot) [![PRs Welcome](https://badgen.net/badge/PRs/welcome/green?icon=https://api.iconify.design/octicon:git-pull-request.svg?color=white&style=flat-square)](CONTRIBUTING.md) [![Slack](https://badgen.net/badge/slack/join/4A154B?icon=slack&style=flat-square)](https://join.slack.com/t/koordinator-sh/shared_invite/zt-1756qoub4-Cn4~esfdlfAPsD7cwO2NzA) @@ -20,8 +20,9 @@ Koordinator已经支持了K8s生态内的在离线混部,通过Batch超卖资 在K8s生态外,仍有相当数量的应用运行在其他资源管理系统,例如Apache Hadoop YARN。作为大数据生态下的资源管理系统,YARN承载了包括MapReduce、 Spark、Flink以及Presto等在内的多种计算引擎。 -为了进一步丰富Koordinator支持的在离线混部场景,Koordinator社区提供了面向大数据场景的YARN混部套件,支持Hadoop YARN应用与K8s混部, -将Koordiantor的Batch资源提供给Hadoop YARN使用,进一步提升集群资源的使用效率。Koordinator YARN混部套件具备以下特点: +为了进一步丰富Koordinator支持的在离线混部场景,Koordinator社区提供了面向大数据场景的YARN混部套件`Koordinator YARN Copilot`, +用于支持Hadoop YARN应用与K8s混部,将Koordiantor的Batch资源提供给Hadoop YARN使用,进一步提升集群资源的使用效率。 +`Koordinator YARN Copilot`具备以下特点: - 面向开源生态:针对开源版本的Hadoop YARN实现,无需对YARN本身做侵入式改造。 - 统一资源优先级和QoS策略:YARN混部套件完全对标Koordinator的Batch资源模型,同时接受单机一系列QoS策略的管控。 diff --git a/README.md b/README.md index 2283ee97..eef7d6f6 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@

-

Koordinator goyarn

+

Koordinator YARN Copilot

Koordinator

[![License](https://img.shields.io/github/license/koordinator-sh/koordinator.svg?color=4EB1BA&style=flat-square)](https://opensource.org/licenses/Apache-2.0) -[![GitHub release](https://img.shields.io/github/v/release/koordinator-sh/goyarn.svg?style=flat-square)](https://github.com/koordinator-sh/goyarn/releases/latest) -[![CI](https://img.shields.io/github/actions/workflow/status/koordinator-sh/goyarn/ci.yaml?label=CI&logo=github&style=flat-square&branch=main)](https://github.com/koordinator-sh/goyarn/actions/workflows/ci.yaml) -[![Go Report Card](https://goreportcard.com/badge/github.com/koordinator-sh/goyarn?style=flat-square)](https://goreportcard.com/report/github.com/koordinator-sh/goyarn) -[![codecov](https://img.shields.io/codecov/c/github/koordinator-sh/goyarn?logo=codecov&style=flat-square)](https://codecov.io/github/koordinator-sh/goyarn) +[![GitHub release](https://img.shields.io/github/v/release/koordinator-sh/yarn-copilot.svg?style=flat-square)](https://github.com/koordinator-sh/yarn-copilot/releases/latest) +[![CI](https://img.shields.io/github/actions/workflow/status/koordinator-sh/yarn-copilot/ci.yaml?label=CI&logo=github&style=flat-square&branch=main)](https://github.com/koordinator-sh/yarn-copilot/actions/workflows/ci.yaml) +[![Go Report Card](https://goreportcard.com/badge/github.com/koordinator-sh/yarn-copilot?style=flat-square)](https://goreportcard.com/report/github.com/koordinator-sh/yarn-copilot) +[![codecov](https://img.shields.io/codecov/c/github/koordinator-sh/yarn-copilot?logo=codecov&style=flat-square)](https://codecov.io/github/koordinator-sh/yarn-copilot) [![PRs Welcome](https://badgen.net/badge/PRs/welcome/green?icon=https://api.iconify.design/octicon:git-pull-request.svg?color=white&style=flat-square)](CONTRIBUTING.md) [![Slack](https://badgen.net/badge/slack/join/4A154B?icon=slack&style=flat-square)](https://join.slack.com/t/koordinator-sh/shared_invite/zt-1756qoub4-Cn4~esfdlfAPsD7cwO2NzA) @@ -21,8 +21,8 @@ running beyond K8s such as Apache Haddop YARN. As a resource management platform numbers of computing engines including MapReduce, Spark, Flink, Presto, etc. In order to extend the co-location scenario of Koordinator, now the community has provided Hadoop YARN extended suits -in BigData ecosystem, supporting running Hadoop YARN jobs by `koord-batch` resources with other K8s pods. The Koordiantor -YARN suits has following characters: +`Koordinator YARN Copilot` in BigData ecosystem, supporting running Hadoop YARN jobs by `koord-batch` resources with +other K8s pods. The `Koordinator YARN Copilot` has following characters: - Open-Source native: implement against open-sourced version of Hadoop YARN; so there is no hack inside YARN modules. - Unifed resource priority and QoS strategy: the suits aims to the `koord-batch` priority of Koordinator, and also managed by QoS strategies of koordlet. diff --git a/cmd/yarn-copilot-agent/main.go b/cmd/yarn-copilot-agent/main.go index 0cff58d1..70c81994 100644 --- a/cmd/yarn-copilot-agent/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-agent/options" - "github.com/koordinator-sh/goyarn/pkg/copilot-agent/nm" - "github.com/koordinator-sh/goyarn/pkg/copilot-agent/server" + "github.com/koordinator-sh/yarn-copilot/cmd/yarn-copilot-agent/options" + "github.com/koordinator-sh/yarn-copilot/pkg/copilot-agent/nm" + "github.com/koordinator-sh/yarn-copilot/pkg/copilot-agent/server" ) func main() { diff --git a/cmd/yarn-operator/main.go b/cmd/yarn-operator/main.go index e216885a..4ca4b65e 100644 --- a/cmd/yarn-operator/main.go +++ b/cmd/yarn-operator/main.go @@ -30,9 +30,9 @@ import ( "k8s.io/klog/v2/klogr" ctrl "sigs.k8s.io/controller-runtime" - "github.com/koordinator-sh/goyarn/cmd/yarn-operator/options" utilclient "github.com/koordinator-sh/koordinator/pkg/util/client" "github.com/koordinator-sh/koordinator/pkg/util/fieldindex" + "github.com/koordinator-sh/yarn-copilot/cmd/yarn-operator/options" ) var ( diff --git a/cmd/yarn-operator/options/controllers.go b/cmd/yarn-operator/options/controllers.go index 5a38a6a0..ad2ca8dc 100644 --- a/cmd/yarn-operator/options/controllers.go +++ b/cmd/yarn-operator/options/controllers.go @@ -19,7 +19,7 @@ package options import ( "sigs.k8s.io/controller-runtime/pkg/manager" - yarnnoderes "github.com/koordinator-sh/goyarn/pkg/controller/noderesource" + yarnnoderes "github.com/koordinator-sh/yarn-copilot/pkg/controller/noderesource" ) var controllerAddFuncs = map[string]func(manager.Manager) error{ diff --git a/docker/yarn-copilot-agent.dockerfile b/docker/yarn-copilot-agent.dockerfile index e54cab35..2f512cf8 100644 --- a/docker/yarn-copilot-agent.dockerfile +++ b/docker/yarn-copilot-agent.dockerfile @@ -1,5 +1,5 @@ FROM golang:1.17 as builder -WORKDIR /go/src/github.com/koordinator-sh/goyarn +WORKDIR /go/src/github.com/koordinator-sh/yarn-copilot COPY go.mod go.mod COPY go.sum go.sum @@ -14,5 +14,5 @@ RUN GOOS=linux GOARCH=amd64 go build -a -o koord-yarn-copilot cmd/yarn-copilot-a FROM nvidia/cuda:11.2.2-base-ubuntu20.04 RUN apt-get add --update bash net-tools iproute2 logrotate less rsync util-linux lvm2 WORKDIR / -COPY --from=builder /go/src/github.com/koordinator-sh/goyarn . +COPY --from=builder /go/src/github.com/koordinator-sh/yarn-copilot . ENTRYPOINT ["/koord-yarn-copilot"] diff --git a/docker/yarn-operator.dockerfile b/docker/yarn-operator.dockerfile index 7257cb27..22dad25d 100644 --- a/docker/yarn-operator.dockerfile +++ b/docker/yarn-operator.dockerfile @@ -1,5 +1,5 @@ FROM golang:1.19 as builder -WORKDIR /go/src/github.com/koordinator-sh/goyarn +WORKDIR /go/src/github.com/koordinator-sh/yarn-copilot COPY go.mod go.mod COPY go.sum go.sum @@ -14,5 +14,5 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o koord-yarn-operator cmd FROM alpine:3.16 RUN apk add --update bash net-tools iproute2 logrotate less rsync util-linux lvm2 WORKDIR / -COPY --from=builder /go/src/github.com/koordinator-sh/goyarn . +COPY --from=builder /go/src/github.com/koordinator-sh/yarn-copilot . ENTRYPOINT ["/koord-yarn-operator"] diff --git a/go.mod b/go.mod index eb70be13..82ef369d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/koordinator-sh/goyarn +module github.com/koordinator-sh/yarn-copilot go 1.19 diff --git a/hack/generate-yarn.sh b/hack/generate-yarn.sh index 9829d3b2..7165871e 100755 --- a/hack/generate-yarn.sh +++ b/hack/generate-yarn.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -GOYARN_PKG_ROOT="github.com/koordinator-sh/goyarn" +GOYARN_PKG_ROOT="github.com/koordinator-sh/yarn-copilot" GOYARN_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. GOYARN_API_PATH="${GOYARN_ROOT}/pkg/yarn/apis/proto" YARN_API_FILES="$( find ${GOYARN_API_PATH} -name "*.proto" )" @@ -57,7 +57,7 @@ function generate_code() { # input: resourcemanager_administration_protocol.proto or server/yarn_server_resourcemanager_service_protos.proto -# output: (yarn_server_resourcemanager_service_protos.proto:koordinator-sh/goyarn/apis/proto/hadoopyarn/server) +# output: (yarn_server_resourcemanager_service_protos.proto:koordinator-sh/yarn-copilot/apis/proto/hadoopyarn/server) function generate_import_files_pkg_map() { input_file_name=${1} file_name="$( echo "${input_file_name}" | grep -Eo "[a-z,_,A-Z]*.proto$" )" # resourcemanager_administration_protocol.proto diff --git a/hack/mock-gen.sh b/hack/mock-gen.sh index 34dfee5b..ff909839 100755 --- a/hack/mock-gen.sh +++ b/hack/mock-gen.sh @@ -20,7 +20,7 @@ set -e SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) LICENSE_HEADER_PATH="./hack/boilerplate/boilerplate.go.txt" -cd $GOPATH/src/github.com/koordinator-sh/goyarn +cd $GOPATH/src/github.com/koordinator-sh/yarn-copilot # generates gomock files mockgen -source pkg/yarn/client/factory.go \ diff --git a/pkg/controller/metrics/yarn_collector.go b/pkg/controller/metrics/yarn_collector.go index 53b61f06..4bad1c13 100644 --- a/pkg/controller/metrics/yarn_collector.go +++ b/pkg/controller/metrics/yarn_collector.go @@ -19,7 +19,7 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" - "github.com/koordinator-sh/goyarn/pkg/yarn/cache" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/cache" ) var ( diff --git a/pkg/controller/noderesource/resource_sync_controller.go b/pkg/controller/noderesource/resource_sync_controller.go index 07fd7548..89a48d67 100644 --- a/pkg/controller/noderesource/resource_sync_controller.go +++ b/pkg/controller/noderesource/resource_sync_controller.go @@ -35,11 +35,11 @@ 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" - yarnclient "github.com/koordinator-sh/goyarn/pkg/yarn/client" + yarnmetrics "github.com/koordinator-sh/yarn-copilot/pkg/controller/metrics" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + yarnserver "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn/server" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/cache" + yarnclient "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client" ) const ( diff --git a/pkg/controller/noderesource/resource_sync_controller_test.go b/pkg/controller/noderesource/resource_sync_controller_test.go index f0bf7c24..223477a2 100644 --- a/pkg/controller/noderesource/resource_sync_controller_test.go +++ b/pkg/controller/noderesource/resource_sync_controller_test.go @@ -32,9 +32,9 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/koordinator-sh/goyarn/pkg/yarn/cache" - yarnclient "github.com/koordinator-sh/goyarn/pkg/yarn/client" - "github.com/koordinator-sh/goyarn/pkg/yarn/client/mockclient" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/cache" + yarnclient "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client/mockclient" ) func TestYARNResourceSyncReconciler_getYARNNode(t *testing.T) { diff --git a/pkg/copilot-agent/nm/nm.go b/pkg/copilot-agent/nm/nm.go index 3c51dbf9..0511917d 100644 --- a/pkg/copilot-agent/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-agent/utils" + "github.com/koordinator-sh/yarn-copilot/pkg/copilot-agent/utils" ) const ( diff --git a/pkg/copilot-agent/server/helper.go b/pkg/copilot-agent/server/helper.go index 72b032c6..aecee322 100644 --- a/pkg/copilot-agent/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-agent/nm" + "github.com/koordinator-sh/yarn-copilot/pkg/copilot-agent/nm" ) func ParseContainerInfo(yarnContainer *nm.YarnContainer, op *nm.NodeMangerOperator) *ContainerInfo { diff --git a/pkg/copilot-agent/server/server.go b/pkg/copilot-agent/server/server.go index cab1000d..10f98d46 100644 --- a/pkg/copilot-agent/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-agent/nm" + "github.com/koordinator-sh/yarn-copilot/pkg/copilot-agent/nm" ) type YarnCopilotServer struct { diff --git a/pkg/yarn/apis/auth/auth.go b/pkg/yarn/apis/auth/auth.go index cdfb290f..8e28122c 100644 --- a/pkg/yarn/apis/auth/auth.go +++ b/pkg/yarn/apis/auth/auth.go @@ -27,7 +27,7 @@ import ( "k8s.io/klog/v2" - hadoop_common "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" + hadoop_common "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" ) var ( diff --git a/pkg/yarn/apis/proto/hadoopyarn/applicationclient_protocol.pb.go b/pkg/yarn/apis/proto/hadoopyarn/applicationclient_protocol.pb.go index b1120f34..33e5fe4a 100644 --- a/pkg/yarn/apis/proto/hadoopyarn/applicationclient_protocol.pb.go +++ b/pkg/yarn/apis/proto/hadoopyarn/applicationclient_protocol.pb.go @@ -31,7 +31,7 @@ package hadoopyarn import ( "reflect" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/runtime/protoimpl" ) diff --git a/pkg/yarn/apis/proto/hadoopyarn/server/yarn_server_resourcemanager_service_protos.pb.go b/pkg/yarn/apis/proto/hadoopyarn/server/yarn_server_resourcemanager_service_protos.pb.go index 9accc05a..6a44570a 100644 --- a/pkg/yarn/apis/proto/hadoopyarn/server/yarn_server_resourcemanager_service_protos.pb.go +++ b/pkg/yarn/apis/proto/hadoopyarn/server/yarn_server_resourcemanager_service_protos.pb.go @@ -32,7 +32,7 @@ import ( "reflect" "sync" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/runtime/protoimpl" ) diff --git a/pkg/yarn/apis/proto/hadoopyarn/yarn_protos.pb.go b/pkg/yarn/apis/proto/hadoopyarn/yarn_protos.pb.go index 8dd3b163..c452d6ac 100644 --- a/pkg/yarn/apis/proto/hadoopyarn/yarn_protos.pb.go +++ b/pkg/yarn/apis/proto/hadoopyarn/yarn_protos.pb.go @@ -32,7 +32,7 @@ import ( "reflect" "sync" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/runtime/protoimpl" ) diff --git a/pkg/yarn/apis/proto/hadoopyarn/yarn_service_protos.pb.go b/pkg/yarn/apis/proto/hadoopyarn/yarn_service_protos.pb.go index 6da64e22..df41b7ba 100644 --- a/pkg/yarn/apis/proto/hadoopyarn/yarn_service_protos.pb.go +++ b/pkg/yarn/apis/proto/hadoopyarn/yarn_service_protos.pb.go @@ -32,7 +32,7 @@ import ( "reflect" "sync" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/runtime/protoimpl" ) diff --git a/pkg/yarn/apis/security/digestmd5.go b/pkg/yarn/apis/security/digestmd5.go index 900e5fe5..7e5d6462 100644 --- a/pkg/yarn/apis/security/digestmd5.go +++ b/pkg/yarn/apis/security/digestmd5.go @@ -27,7 +27,7 @@ import ( "k8s.io/klog/v2" - hadoop_common "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" + hadoop_common "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" ) func getChallengeParams(challenge string) (map[string]string, error) { diff --git a/pkg/yarn/apis/security/ugi.go b/pkg/yarn/apis/security/ugi.go index 0e69052a..bf3482fe 100644 --- a/pkg/yarn/apis/security/ugi.go +++ b/pkg/yarn/apis/security/ugi.go @@ -23,7 +23,7 @@ import ( "k8s.io/klog/v2" - hadoop_common "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" + hadoop_common "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" ) /** a (very) basic UserGroupInformation implementation for storing user data/tokens, diff --git a/pkg/yarn/apis/service/applicationclient_service.go b/pkg/yarn/apis/service/applicationclient_service.go index 837f9cec..89e66d21 100644 --- a/pkg/yarn/apis/service/applicationclient_service.go +++ b/pkg/yarn/apis/service/applicationclient_service.go @@ -23,10 +23,10 @@ import ( uuid "github.com/nu7hatch/gouuid" "google.golang.org/protobuf/proto" - gohadoop "github.com/koordinator-sh/goyarn/pkg/yarn/apis/auth" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" - hadoop_ipc_client "github.com/koordinator-sh/goyarn/pkg/yarn/client/ipc" - yarn_conf "github.com/koordinator-sh/goyarn/pkg/yarn/config" + gohadoop "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/auth" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + hadoop_ipc_client "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client/ipc" + yarn_conf "github.com/koordinator-sh/yarn-copilot/pkg/yarn/config" ) // Reference proto, json, and math imports to suppress error if they are not otherwise used. diff --git a/pkg/yarn/apis/service/ha_service.go b/pkg/yarn/apis/service/ha_service.go index 93adf20d..a0479e26 100644 --- a/pkg/yarn/apis/service/ha_service.go +++ b/pkg/yarn/apis/service/ha_service.go @@ -23,9 +23,9 @@ import ( uuid "github.com/nu7hatch/gouuid" "google.golang.org/protobuf/proto" - gohadoop "github.com/koordinator-sh/goyarn/pkg/yarn/apis/auth" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" - hadoop_ipc_client "github.com/koordinator-sh/goyarn/pkg/yarn/client/ipc" + gohadoop "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/auth" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" + hadoop_ipc_client "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client/ipc" ) // Reference proto, json, and math imports to suppress error if they are not otherwise used. diff --git a/pkg/yarn/apis/service/resourcemanager_administration_service.go b/pkg/yarn/apis/service/resourcemanager_administration_service.go index 546f2d88..7cf11450 100644 --- a/pkg/yarn/apis/service/resourcemanager_administration_service.go +++ b/pkg/yarn/apis/service/resourcemanager_administration_service.go @@ -23,10 +23,10 @@ import ( uuid "github.com/nu7hatch/gouuid" "google.golang.org/protobuf/proto" - gohadoop "github.com/koordinator-sh/goyarn/pkg/yarn/apis/auth" - yarnserver "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn/server" - hadoop_ipc_client "github.com/koordinator-sh/goyarn/pkg/yarn/client/ipc" - yarn_conf "github.com/koordinator-sh/goyarn/pkg/yarn/config" + gohadoop "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/auth" + yarnserver "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn/server" + hadoop_ipc_client "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client/ipc" + yarn_conf "github.com/koordinator-sh/yarn-copilot/pkg/yarn/config" ) // Reference proto, json, and math imports to suppress error if they are not otherwise used. diff --git a/pkg/yarn/cache/nodes_syncer.go b/pkg/yarn/cache/nodes_syncer.go index 043d767d..cfba6fd1 100644 --- a/pkg/yarn/cache/nodes_syncer.go +++ b/pkg/yarn/cache/nodes_syncer.go @@ -24,8 +24,8 @@ import ( "k8s.io/klog/v2" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" - yarnclient "github.com/koordinator-sh/goyarn/pkg/yarn/client" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + yarnclient "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client" ) const ( diff --git a/pkg/yarn/client/application_client.go b/pkg/yarn/client/application_client.go index 765ad259..b9f08089 100644 --- a/pkg/yarn/client/application_client.go +++ b/pkg/yarn/client/application_client.go @@ -17,9 +17,9 @@ limitations under the License. package client import ( - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" - yarnservice "github.com/koordinator-sh/goyarn/pkg/yarn/apis/service" - yarnconf "github.com/koordinator-sh/goyarn/pkg/yarn/config" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + yarnservice "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/service" + yarnconf "github.com/koordinator-sh/yarn-copilot/pkg/yarn/config" ) type YarnApplicationClient struct { diff --git a/pkg/yarn/client/client.go b/pkg/yarn/client/client.go index dd3d9745..90cf3012 100644 --- a/pkg/yarn/client/client.go +++ b/pkg/yarn/client/client.go @@ -20,10 +20,10 @@ import ( "fmt" "k8s.io/klog/v2" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" - yarnserver "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn/server" - yarnconf "github.com/koordinator-sh/goyarn/pkg/yarn/config" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + yarnserver "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn/server" + yarnconf "github.com/koordinator-sh/yarn-copilot/pkg/yarn/config" ) type YarnClient interface { diff --git a/pkg/yarn/client/examples/ha-get-service-status/main.go b/pkg/yarn/client/examples/ha-get-service-status/main.go index dae1dd95..384ee791 100644 --- a/pkg/yarn/client/examples/ha-get-service-status/main.go +++ b/pkg/yarn/client/examples/ha-get-service-status/main.go @@ -20,9 +20,9 @@ import ( "log" "os" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" - yarnclient "github.com/koordinator-sh/goyarn/pkg/yarn/client" - yarnconf "github.com/koordinator-sh/goyarn/pkg/yarn/config" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" + yarnclient "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client" + yarnconf "github.com/koordinator-sh/yarn-copilot/pkg/yarn/config" ) func main() { diff --git a/pkg/yarn/client/examples/rm-get-cluster-nodes-with-ha/main.go b/pkg/yarn/client/examples/rm-get-cluster-nodes-with-ha/main.go index bd4c2fbc..a6fccea3 100644 --- a/pkg/yarn/client/examples/rm-get-cluster-nodes-with-ha/main.go +++ b/pkg/yarn/client/examples/rm-get-cluster-nodes-with-ha/main.go @@ -19,8 +19,8 @@ package main import ( "log" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" - yarnclient "github.com/koordinator-sh/goyarn/pkg/yarn/client" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + yarnclient "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client" ) func main() { diff --git a/pkg/yarn/client/examples/rm-update-node-resource-with-ha/main.go b/pkg/yarn/client/examples/rm-update-node-resource-with-ha/main.go index 394f172d..c977275c 100644 --- a/pkg/yarn/client/examples/rm-update-node-resource-with-ha/main.go +++ b/pkg/yarn/client/examples/rm-update-node-resource-with-ha/main.go @@ -19,9 +19,9 @@ package main import ( "log" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" - yarnserver "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn/server" - yarnclient "github.com/koordinator-sh/goyarn/pkg/yarn/client" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + yarnserver "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn/server" + yarnclient "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client" ) func main() { diff --git a/pkg/yarn/client/examples/rm-update-node-resource/main.go b/pkg/yarn/client/examples/rm-update-node-resource/main.go index 6c5729e2..b026d812 100644 --- a/pkg/yarn/client/examples/rm-update-node-resource/main.go +++ b/pkg/yarn/client/examples/rm-update-node-resource/main.go @@ -20,10 +20,10 @@ import ( "log" "os" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" - yarnserver "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn/server" - yarnclient "github.com/koordinator-sh/goyarn/pkg/yarn/client" - yarnconf "github.com/koordinator-sh/goyarn/pkg/yarn/config" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + yarnserver "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn/server" + yarnclient "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client" + yarnconf "github.com/koordinator-sh/yarn-copilot/pkg/yarn/config" ) func main() { diff --git a/pkg/yarn/client/ha_service_client.go b/pkg/yarn/client/ha_service_client.go index 8b24630c..8224af6a 100644 --- a/pkg/yarn/client/ha_service_client.go +++ b/pkg/yarn/client/ha_service_client.go @@ -17,8 +17,8 @@ limitations under the License. package client import ( - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" - yarnservice "github.com/koordinator-sh/goyarn/pkg/yarn/apis/service" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" + yarnservice "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/service" ) type YarnHAClient struct { diff --git a/pkg/yarn/client/ipc/client.go b/pkg/yarn/client/ipc/client.go index a9b645e8..107e69a1 100644 --- a/pkg/yarn/client/ipc/client.go +++ b/pkg/yarn/client/ipc/client.go @@ -32,9 +32,9 @@ import ( "google.golang.org/protobuf/proto" "k8s.io/klog/v2" - yarnauth "github.com/koordinator-sh/goyarn/pkg/yarn/apis/auth" - hadoop_common "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopcommon" - "github.com/koordinator-sh/goyarn/pkg/yarn/apis/security" + yarnauth "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/auth" + hadoop_common "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopcommon" + "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/security" ) const ( diff --git a/pkg/yarn/client/mockclient/mock_client.go b/pkg/yarn/client/mockclient/mock_client.go index 55031bb2..5f6bbce7 100644 --- a/pkg/yarn/client/mockclient/mock_client.go +++ b/pkg/yarn/client/mockclient/mock_client.go @@ -25,8 +25,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - hadoopyarn "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn" - server "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn/server" + hadoopyarn "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn" + server "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn/server" ) // MockYarnClient is a mock of YarnClient interface. diff --git a/pkg/yarn/client/mockclient/mock_factory.go b/pkg/yarn/client/mockclient/mock_factory.go index d370c57e..a68ace2a 100644 --- a/pkg/yarn/client/mockclient/mock_factory.go +++ b/pkg/yarn/client/mockclient/mock_factory.go @@ -25,7 +25,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - client "github.com/koordinator-sh/goyarn/pkg/yarn/client" + client "github.com/koordinator-sh/yarn-copilot/pkg/yarn/client" ) // MockYarnClientFactory is a mock of YarnClientFactory interface. diff --git a/pkg/yarn/client/rm_admin_client.go b/pkg/yarn/client/rm_admin_client.go index 5f268085..f14f4615 100644 --- a/pkg/yarn/client/rm_admin_client.go +++ b/pkg/yarn/client/rm_admin_client.go @@ -17,9 +17,9 @@ limitations under the License. package client import ( - yarnserver "github.com/koordinator-sh/goyarn/pkg/yarn/apis/proto/hadoopyarn/server" - yarnservice "github.com/koordinator-sh/goyarn/pkg/yarn/apis/service" - yarnconf "github.com/koordinator-sh/goyarn/pkg/yarn/config" + yarnserver "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/proto/hadoopyarn/server" + yarnservice "github.com/koordinator-sh/yarn-copilot/pkg/yarn/apis/service" + yarnconf "github.com/koordinator-sh/yarn-copilot/pkg/yarn/config" ) type YarnAdminClient struct {