Skip to content

Commit

Permalink
chores: change repo name to yarn-copilot (#57)
Browse files Browse the repository at this point in the history
Signed-off-by: 佑祎 <zzw261520@alibaba-inc.com>
  • Loading branch information
zwzhang0107 committed Nov 17, 2023
1 parent 638b94c commit 6563544
Show file tree
Hide file tree
Showing 38 changed files with 90 additions and 89 deletions.
15 changes: 8 additions & 7 deletions README-zh_CN.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<h1 align="center">
<p align="center">Koordinator goyarn</p>
<p align="center">Koordinator YARN Copilot</p>
<a href="https://koordinator.sh"><img src="https://github.com/koordinator-sh/koordinator/raw/main/docs/images/koordinator-logo.jpeg" alt="Koordinator"></a>
</h1>

[![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)

Expand All @@ -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策略的管控。
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<h1 align="center">
<p align="center">Koordinator goyarn</p>
<p align="center">Koordinator YARN Copilot</p>
<a href="https://koordinator.sh"><img src="https://github.com/koordinator-sh/koordinator/raw/main/docs/images/koordinator-logo.jpeg" alt="Koordinator"></a>
</h1>

[![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)

Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cmd/yarn-copilot-agent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/yarn-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmd/yarn-operator/options/controllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions docker/yarn-copilot-agent.dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]
4 changes: 2 additions & 2 deletions docker/yarn-operator.dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/koordinator-sh/goyarn
module github.com/koordinator-sh/yarn-copilot

go 1.19

Expand Down
4 changes: 2 additions & 2 deletions hack/generate-yarn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" )"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/mock-gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/metrics/yarn_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
10 changes: 5 additions & 5 deletions pkg/controller/noderesource/resource_sync_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/noderesource/resource_sync_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/copilot-agent/nm/nm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/copilot-agent/server/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/copilot-agent/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/yarn/apis/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/yarn/apis/proto/hadoopyarn/yarn_protos.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/yarn/apis/proto/hadoopyarn/yarn_service_protos.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/yarn/apis/security/digestmd5.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/yarn/apis/security/ugi.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions pkg/yarn/apis/service/applicationclient_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions pkg/yarn/apis/service/ha_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkg/yarn/cache/nodes_syncer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions pkg/yarn/client/application_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions pkg/yarn/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions pkg/yarn/client/examples/ha-get-service-status/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/yarn/client/examples/rm-get-cluster-nodes-with-ha/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading

0 comments on commit 6563544

Please sign in to comment.