From 15e3dcab511ba0dd058a1ac497711b85b026f0f9 Mon Sep 17 00:00:00 2001 From: xueyingcai Date: Mon, 18 Jul 2022 20:41:16 +0800 Subject: [PATCH 1/2] fix(mod): rm replacement of kubebrain-client Change-Id: Idf4aa965f24324f64079dc33ec490126352e9560 --- go.mod | 3 +-- go.sum | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index a134cc2..7b23dc8 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/huandu/skiplist v1.1.0 github.com/kr/text v0.2.0 // indirect - github.com/kubewharf/kubebrain-client v0.2.0 + github.com/kubewharf/kubebrain-client v0.2.1 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.1 @@ -44,7 +44,6 @@ require ( ) replace ( - github.com/kubewharf/kubebrain-client => ../kubebrain-client google.golang.org/grpc => google.golang.org/grpc v1.38.0 k8s.io/api => k8s.io/api v0.0.0-20191004102349-159aefb8556b k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191004105649-b14e3c49469a diff --git a/go.sum b/go.sum index 0e085ab..b097161 100644 --- a/go.sum +++ b/go.sum @@ -267,6 +267,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kubewharf/kubebrain-client v0.2.1 h1:L+VA32ka/W0YwvCoPwrZQv0hV+m0s1Jgj9LH2koCcVw= +github.com/kubewharf/kubebrain-client v0.2.1/go.mod h1:9zABgniqD368gyUP4v9myKDzZu/FxFEPLLz3AIMl79I= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= From 731b1bed238415f4e4ae191f2720c3d77ae2fad4 Mon Sep 17 00:00:00 2001 From: xueyingcai Date: Mon, 18 Jul 2022 20:50:45 +0800 Subject: [PATCH 2/2] docs(readme): update emails of maintainers Change-Id: I9ab54549189f1905ab9fc0ef7d30474dd4d96cd7 --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 2 ++ CODE_OF_CONDUCT.md | 2 +- MAINTAINER.md | 10 ++++++++++ README.md | 8 +++++--- README_CN.md | 9 +++++---- 6 files changed, 23 insertions(+), 8 deletions(-) delete mode 100644 .DS_Store create mode 100644 MAINTAINER.md diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 7147c8b25b96ab3701bf8b7bcf9ab1bc40444a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8DBg3>+mcOx(CkxmWNF7Gs~l7jTgf0>KUrcKxcHD@XI_Lx_2VxJhG1AkD5; zvyV5$(-Qz&9-kJ#9Ke+Bh))k=^KR+`4v9&J)$n2UWUC3q;_1Aoi&RVP$`2YX_ diff --git a/.gitignore b/.gitignore index 06b7c23..8ff9fd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.DS_Store +.vscode .idea output bin diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 07f5103..f42aa60 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,7 +60,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -xuchen.xiaoying@bytedance.com. +kubewharf.conduct@bytedance.com. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/MAINTAINER.md b/MAINTAINER.md new file mode 100644 index 0000000..d7717c2 --- /dev/null +++ b/MAINTAINER.md @@ -0,0 +1,10 @@ +# The KubeBrain Maintainers + +This file lists the maintainers of the KubeBrain project. + +## Project Maintainers + +| Name | GitHub ID | Affiliation | +|-------------|-------------------------------------------------------| ----------- | +| Chen Xu | [xuchen-xiaoying](https://github.com/xuchen-xiaoying) | ByteDance | +| Yingcai Xue | [divanodestiny](https://github.com/divanodestiny) | ByteDance | diff --git a/README.md b/README.md index 6f56b9b..a82b72e 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,12 @@ Please check [Contributing](CONTRIBUTING.md) for more details. Please check [Code of Conduct](CODE_OF_CONDUCT.md) for more details. +## Community + +- Email: kubewharf.conduct@bytedance.com +- Member: Please refer to [Maintainers](./MAINTAINER.md). + ## License This project is licensed under the [Apache-2.0 License](LICENSE). -## Community - -- Email: [xuchen.xiaoying@bytedance.com](xuchen.xiaoying@bytedance.com) diff --git a/README_CN.md b/README_CN.md index d3a090f..2e203d6 100644 --- a/README_CN.md +++ b/README_CN.md @@ -45,10 +45,11 @@ [Contributing](CONTRIBUTING.md) -# 开源许可 +# 联系我们 -KubeBrain基于[Apache License 2.0](LICENSE)许可证。 +- Email: kubewharf.conduct@bytedance.com +- Member: 请查看 [Maintainers](./MAINTAINER.md) -# 联系我们 +# 开源许可 -- Email: [xuchen.xiaoying@bytedance.com](xuchen.xiaoying@bytedance.com) \ No newline at end of file +KubeBrain基于[Apache License 2.0](LICENSE)许可证。