You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@yunikorn.apache.org by cc...@apache.org on 2022/03/25 15:39:51 UTC
[yunikorn-site] branch master updated: [YUNIKORN-1150] Remove incubator references from website. (#143)
This is an automated email from the ASF dual-hosted git repository.
ccondit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-site.git
The following commit(s) were added to refs/heads/master by this push:
new 71a11b0 [YUNIKORN-1150] Remove incubator references from website. (#143)
71a11b0 is described below
commit 71a11b0b26a83959c099447fca85df37fdbc0c5b
Author: Craig Condit <cc...@apache.org>
AuthorDate: Fri Mar 25 10:39:40 2022 -0500
[YUNIKORN-1150] Remove incubator references from website. (#143)
Closes: #143
---
.github/workflows/auto-publish.yml | 2 +-
DISCLAIMER | 8 ---
Dockerfile | 4 +-
NOTICE | 2 +-
README.md | 2 +-
docs/api/scheduler.md | 12 ++---
docs/design/architecture.md | 10 ++--
docs/design/k8shim.md | 4 +-
docs/design/predicates.md | 4 +-
docs/design/resilience.md | 2 +-
docs/design/scheduler_core_design.md | 10 ++--
docs/developer_guide/build.md | 18 +++----
docs/developer_guide/deployment.md | 12 ++---
docs/get_started/get_started.md | 2 +-
docs/performance/performance_tutorial.md | 10 ++--
docs/performance/profiling.md | 8 +--
docs/user_guide/queue_config.md | 4 +-
docs/user_guide/resource_quota_mgmt.md | 2 +-
docs/user_guide/usergroup_resolution.md | 4 +-
docs/user_guide/workloads/run_tensorflow.md | 4 +-
docusaurus.config.js | 29 ++++-------
.../current/get_started/get_started.md | 2 +-
.../current/performance/performance_tutorial.md | 4 +-
.../current/user_guide/workloads/run_tensorflow.md | 4 +-
.../community/coding_guidelines.md | 4 +-
.../community/download.md | 6 +--
.../community/get_involved.md | 2 +-
.../community/people.md | 22 ++++-----
.../zh-cn/docusaurus-plugin-content-pages/index.js | 2 +-
i18n/zh-cn/docusaurus-theme-classic/navbar.json | 3 --
local-build.sh | 6 +--
src/pages/community/coding_guidelines.md | 4 +-
src/pages/community/download.md | 6 +--
src/pages/community/get_involved.md | 2 +-
src/pages/community/people.md | 24 ++++-----
src/pages/community/release_procedure.md | 57 +++++++++++-----------
src/pages/index.js | 2 +-
static/img/logo/yunikorn_logo.svg | 2 +-
38 files changed, 141 insertions(+), 164 deletions(-)
diff --git a/.github/workflows/auto-publish.yml b/.github/workflows/auto-publish.yml
index 93627ff..4e321e7 100644
--- a/.github/workflows/auto-publish.yml
+++ b/.github/workflows/auto-publish.yml
@@ -45,7 +45,7 @@ jobs:
working-directory: './yunikorn-asf-site'
run: |
mkdir /tmp/site-backup
- docker cp yunikorn-site:/incubator-yunikorn-site/build /tmp/site-backup/
+ docker cp yunikorn-site:/yunikorn-site/build /tmp/site-backup/
echo "wipe out the content (except files starting with dot)"
rm -rf ./*
cp -R /tmp/site-backup/build/* .
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 081fd14..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache YuniKorn (Incubating) is an effort undergoing incubation
-at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
diff --git a/Dockerfile b/Dockerfile
index 5483e81..02ff271 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,8 +15,8 @@
FROM node:16.13.0
-ADD . /incubator-yunikorn-site
-WORKDIR /incubator-yunikorn-site
+ADD . /yunikorn-site
+WORKDIR /yunikorn-site
RUN yarn install
RUN yarn add @docusaurus/theme-search-algolia
diff --git a/NOTICE b/NOTICE
index 8e0bc3c..35d0bdd 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache YuniKorn (Incubating)
+Apache YuniKorn
Copyright 2019-2022 The Apache Software Foundation
This product includes software developed at
diff --git a/README.md b/README.md
index f36772c..9e392c2 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
-->
# Apache YuniKorn website
---
-
+
This README will walk you through building and updating the Apache YuniKorn website.
diff --git a/docs/api/scheduler.md b/docs/api/scheduler.md
index a57e1d2..340c6a9 100644
--- a/docs/api/scheduler.md
+++ b/docs/api/scheduler.md
@@ -682,23 +682,23 @@ Dumps the stack traces of the currently running goroutines.
```text
goroutine 356 [running
]:
-github.com/apache/incubator-yunikorn-core/pkg/webservice.getStackInfo.func1(0x30a0060,
+github.com/apache/yunikorn-core/pkg/webservice.getStackInfo.func1(0x30a0060,
0xc003e900e0,
0x2)
- /yunikorn/go/pkg/mod/github.com/apache/incubator-yunikorn-core@v0.0.0-20200717041747-f3e1c760c714/pkg/webservice/handlers.go: 41 +0xab
-github.com/apache/incubator-yunikorn-core/pkg/webservice.getStackInfo(0x30a0060,
+ /yunikorn/go/pkg/mod/github.com/apache/yunikorn-core@v0.0.0-20200717041747-f3e1c760c714/pkg/webservice/handlers.go: 41 +0xab
+github.com/apache/yunikorn-core/pkg/webservice.getStackInfo(0x30a0060,
0xc003e900e0,
0xc00029ba00)
- /yunikorn/go/pkg/mod/github.com/apache/incubator-yunikorn-core@v0.0.0-20200717041747-f3e1c760c714/pkg/webservice/handlers.go: 48 +0x71
+ /yunikorn/go/pkg/mod/github.com/apache/yunikorn-core@v0.0.0-20200717041747-f3e1c760c714/pkg/webservice/handlers.go: 48 +0x71
net/http.HandlerFunc.ServeHTTP(0x2df0e10,
0x30a0060,
0xc003e900e0,
0xc00029ba00)
/usr/local/go/src/net/http/server.go: 1995 +0x52
-github.com/apache/incubator-yunikorn-core/pkg/webservice.Logger.func1(0x30a0060,
+github.com/apache/yunikorn-core/pkg/webservice.Logger.func1(0x30a0060,
0xc003e900e0,
0xc00029ba00)
- /yunikorn/go/pkg/mod/github.com/apache/incubator-yunikorn-core@v0.0.0-20200717041747-f3e1c760c714/pkg/webservice/webservice.go: 65 +0xd4
+ /yunikorn/go/pkg/mod/github.com/apache/yunikorn-core@v0.0.0-20200717041747-f3e1c760c714/pkg/webservice/webservice.go: 65 +0xd4
net/http.HandlerFunc.ServeHTTP(0xc00003a570,
0x30a0060,
0xc003e900e0,
diff --git a/docs/design/architecture.md b/docs/design/architecture.md
index e7e2569..40db1bc 100644
--- a/docs/design/architecture.md
+++ b/docs/design/architecture.md
@@ -22,7 +22,7 @@ specific language governing permissions and limitations
under the License.
-->
-Apache YuniKorn (Incubating) is a light-weight, universal resource scheduler for container orchestrator systems.
+Apache YuniKorn is a light-weight, universal resource scheduler for container orchestrator systems.
It is created to achieve fine-grained resource sharing for various workloads efficiently on a large scale, multi-tenant,
and cloud-native environment. YuniKorn brings a unified, cross-platform, scheduling experience for mixed workloads that
consist of stateless batch workloads and stateful services.
@@ -41,7 +41,7 @@ Following chart illustrates the high-level architecture of YuniKorn.
### Scheduler interface
-[Scheduler interface](https://github.com/apache/incubator-yunikorn-scheduler-interface) is an abstract layer
+[Scheduler interface](https://github.com/apache/yunikorn-scheduler-interface) is an abstract layer
which resource management platform (like YARN/K8s) will speak with, via API like GRPC/programing language bindings.
### Scheduler core
@@ -49,7 +49,7 @@ which resource management platform (like YARN/K8s) will speak with, via API like
Scheduler core encapsulates all scheduling algorithms, it collects resources from underneath resource management
platforms (like YARN/K8s), and is responsible for container allocation requests. It makes the decision where is the
best spot for each request and then sends response allocations to the resource management platform.
-Scheduler core is agnostic about underneath platforms, all the communications are through the [scheduler interface](https://github.com/apache/incubator-yunikorn-scheduler-interface).
+Scheduler core is agnostic about underneath platforms, all the communications are through the [scheduler interface](https://github.com/apache/yunikorn-scheduler-interface).
Please read more about the design of schedule core [here](scheduler_core_design.md).
### Kubernetes shim
@@ -57,6 +57,6 @@ Please read more about the design of schedule core [here](scheduler_core_design.
The YuniKorn Kubernetes shim is responsible for talking to Kubernetes, it is responsible for translating the Kubernetes
cluster resources, and resource requests via scheduler interface and send them to the scheduler core.
And when a scheduler decision is made, it is responsible for binding the pod to the specific node. All the communication
-between the shim and the scheduler core is through the [scheduler interface](https://github.com/apache/incubator-yunikorn-scheduler-interface).
-Please read more about the design of the Kubernetes shim [here](k8shim.md)
+between the shim and the scheduler core is through the [scheduler interface](https://github.com/apache/yunikorn-scheduler-interface).
+Please read more about the design of the Kubernetes shim [here](k8shim.md).
diff --git a/docs/design/k8shim.md b/docs/design/k8shim.md
index 4e9e7e7..d8a9540 100644
--- a/docs/design/k8shim.md
+++ b/docs/design/k8shim.md
@@ -22,7 +22,7 @@ specific language governing permissions and limitations
under the License.
-->
-Github repo: https://github.com/apache/incubator-yunikorn-k8shim
+Github repo: https://github.com/apache/yunikorn-k8shim
Please read the [architecture](architecture.md) doc before reading this one, you will need to understand
the 3 layer design of YuniKorn before getting to understand what is the Kubernetes shim.
@@ -60,7 +60,7 @@ and a [validation webhook](https://kubernetes.io/docs/reference/access-authn-aut
### Admission controller deployment
Currently, the deployment of the admission-controller is done as a `post-start` hook in the scheduler deployment, similarly, the
-uninstall is done as a `pre-stop` hook. See the related code [here](https://github.com/apache/incubator-yunikorn-release/blob/56e580af24ed3433e7d73d9ea556b19ad7b74337/helm-charts/yunikorn/templates/deployment.yaml#L80-L85).
+uninstall is done as a `pre-stop` hook. See the related code [here](https://github.com/apache/yunikorn-release/blob/56e580af24ed3433e7d73d9ea556b19ad7b74337/helm-charts/yunikorn/templates/deployment.yaml#L80-L85).
During the installation, it is expected to always co-locate the admission controller with the scheduler pod, this is done
by adding the pod-affinity in the admission-controller pod, like:
diff --git a/docs/design/predicates.md b/docs/design/predicates.md
index f750cbd..9233a25 100644
--- a/docs/design/predicates.md
+++ b/docs/design/predicates.md
@@ -31,7 +31,7 @@ code as much as possible.
YuniKorn-core is agnostic about underneath RMs, so the predicates functions are implemented in K8s-shim as a `SchedulerPlugin`.
SchedulerPlugin is a way to plug/extend scheduler capabilities. Shim can implement such plugin and register itself to
yunikorn-core, so plugged function can be invoked in the scheduler core. Find all supported plugins in
-[types](https://github.com/apache/incubator-yunikorn-core/blob/master/pkg/plugins/types.go).
+[types](https://github.com/apache/yunikorn-core/blob/master/pkg/plugins/types.go).
## Workflow
@@ -77,4 +77,4 @@ Intentionally, we only support a white-list of predicates. Majorly due to 2 reas
* Predicate functions are time-consuming, it has negative impact on scheduler performance. To support predicates that are only necessary can minimize the impact. This will be configurable via CLI options;
* The implementation depends heavily on K8s default scheduler code, though we reused some unit tests, the coverage is still a problem. We'll continue to improve the coverage when adding new predicates.
-the white-list currently is defined in [DefaultSchedulerPolicy](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/pkg/plugin/predicates/predictor.go).
+The white-list currently is defined in [PredicateManager](https://github.com/apache/yunikorn-k8shim/blob/master/pkg/plugin/predicates/predicate_manager.go).
diff --git a/docs/design/resilience.md b/docs/design/resilience.md
index c68a708..ac0c93b 100644
--- a/docs/design/resilience.md
+++ b/docs/design/resilience.md
@@ -119,7 +119,7 @@ message AddApplicationRequest {
#### Nodes and allocations
Once a shim is registered to the scheduler-core, subsequent requests are sent via `UpdateRequest#NewNodeInfo`
-(see more from [si.proto](https://github.com/apache/incubator-yunikorn-scheduler-interface/blob/master/si.proto)).
+(see more from [si.proto](https://github.com/apache/yunikorn-scheduler-interface/blob/master/si.proto)).
The structure of the messages looks like,
```
diff --git a/docs/design/scheduler_core_design.md b/docs/design/scheduler_core_design.md
index 3b42a8f..917c172 100644
--- a/docs/design/scheduler_core_design.md
+++ b/docs/design/scheduler_core_design.md
@@ -27,12 +27,12 @@ This document will not be maintained and is just for historical reference.
See [scheduler cache removal design](cache_removal.md)
:::
-Github repo: https://github.com/apache/incubator-yunikorn-core/
+Github repo: https://github.com/apache/yunikorn-core
Scheduler core encapsulates all scheduling algorithms, it collects resources from underneath resource management
platforms (like YARN/K8s), and is responsible for container allocation requests. It makes the decision where is the
best spot for each request and then sends response allocations to the resource management platform.
-Scheduler core is agnostic about underneath platforms, all the communications are through the [scheduler interface](https://github.com/apache/incubator-yunikorn-scheduler-interface).
+Scheduler core is agnostic about underneath platforms, all the communications are through the [scheduler interface](https://github.com/apache/yunikorn-scheduler-interface).
## Components:
@@ -110,8 +110,8 @@ will be handled by event handler.
## Communication between Shim and Core
-YuniKorn-Shim (like https://github.com/apache/incubator-yunikorn-k8shim) communicates with core by
-using scheduler-interface (https://github.com/apache/incubator-yunikorn-scheduler-interface).
+YuniKorn-Shim (like https://github.com/apache/yunikorn-k8shim) communicates with core by
+using scheduler-interface (https://github.com/apache/yunikorn-scheduler-interface).
Scheduler interface has Go API or GRPC. Currently, yunikorn-k8shim is using Go API to communicate with yunikorn-core
to avoid extra overhead introduced by GRPC.
@@ -398,4 +398,4 @@ Internal partition need to be normalized, for example, RM specify node with part
Scheduler internally need to normalize it to <rm-id>_xyz
This need to be done by RMProxy
-```
\ No newline at end of file
+```
diff --git a/docs/developer_guide/build.md b/docs/developer_guide/build.md
index c7b9d04..586a630 100644
--- a/docs/developer_guide/build.md
+++ b/docs/developer_guide/build.md
@@ -22,7 +22,7 @@ specific language governing permissions and limitations
under the License.
-->
-YuniKorn always works with a container orchestrator system. Currently, a Kubernetes shim [yunikorn-k8shim](https://github.com/apache/incubator-yunikorn-k8shim)
+YuniKorn always works with a container orchestrator system. Currently, a Kubernetes shim [yunikorn-k8shim](https://github.com/apache/yunikorn-k8shim)
is provided in our repositories, you can leverage it to develop YuniKorn scheduling features and integrate with Kubernetes.
This document describes resources how to setup dev environment and how to do the development.
@@ -35,14 +35,14 @@ Read the [environment setup guide](developer_guide/env_setup.md) first to setup
Prerequisite:
- Go 1.16+
-You can build the scheduler for Kubernetes from [yunikorn-k8shim](https://github.com/apache/incubator-yunikorn-k8shim) project.
+You can build the scheduler for Kubernetes from [yunikorn-k8shim](https://github.com/apache/yunikorn-k8shim) project.
The build procedure will build all components into a single executable that can be deployed and running on Kubernetes.
Start the integrated build process by pulling the `yunikorn-k8shim` repository:
```bash
mkdir $HOME/yunikorn/
cd $HOME/yunikorn/
-git clone https://github.com/apache/incubator-yunikorn-k8shim.git
+git clone https://github.com/apache/yunikorn-k8shim.git
```
At this point you have an environment that will allow you to build an integrated image for the YuniKorn scheduler.
@@ -68,7 +68,7 @@ make image
```
The image with the build in configuration can be deployed directly on kubernetes.
-Some sample deployments that can be used are found under [deployments](https://github.com/apache/incubator-yunikorn-k8shim/tree/master/deployments/scheduler) directory.
+Some sample deployments that can be used are found under [deployments](https://github.com/apache/yunikorn-k8shim/tree/master/deployments/scheduler) directory.
For the deployment that uses a config map you need to set up the ConfigMap in kubernetes.
How to deploy the scheduler with a ConfigMap is explained in the [scheduler configuration deployment](developer_guide/deployment.md) document.
@@ -140,17 +140,17 @@ There is no need to change any of the imports in the source code. The change mus
Using `replace` to use of a forked dependency, such as:
```
-replace github.com/apache/incubator-yunikorn-core => example.com/some/forked-yunikorn
+replace github.com/apache/yunikorn-core => example.com/some/forked-yunikorn
```
There is no requirement to fork and create a new repository. If you do not have a repository you can use a local checked out copy too.
Using `replace` to use of a local directory as a dependency:
```
-replace github.com/apache/incubator-yunikorn-core => /User/example/local/checked-out-yunikorn
+replace github.com/apache/yunikorn-core => /User/example/local/checked-out-yunikorn
```
and for the same dependency using a relative path:
```
-replace github.com/apache/incubator-yunikorn-core => ../checked-out-yunikorn
+replace github.com/apache/yunikorn-core => ../checked-out-yunikorn
```
Note: if the `replace` directive is using a local filesystem path, then the target must have the `go.mod` file at that location.
@@ -158,7 +158,7 @@ Further details on the modules' wiki: [When should I use the 'replace' directive
## Build the web UI
-Example deployments reference the [YuniKorn web UI](https://github.com/apache/incubator-yunikorn-web).
+Example deployments reference the [YuniKorn web UI](https://github.com/apache/yunikorn-web).
The YuniKorn web UI has its own specific requirements for the build. The project has specific requirements for the build follow the steps in the README to prepare a development environment and build how to build the projects.
The scheduler is fully functional without the web UI.
@@ -187,4 +187,4 @@ as long as the `$HOME/.kube/config` file is pointing to that remote cluster.
Yunikorn has an external REST interface which is validated by end-to-end tests. However, the tests exist in the k8shim repository.
Whenever a change is made to the external interface, make sure that it is validated by running e2e tests or adjust the test cases accordingly.
-How to run the tests locally is described [here](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/test/e2e/README.md).
+How to run the tests locally is described [here](https://github.com/apache/yunikorn-k8shim/blob/master/test/e2e/README.md).
diff --git a/docs/developer_guide/deployment.md b/docs/developer_guide/deployment.md
index 4ca96ef..7e5aa5b 100644
--- a/docs/developer_guide/deployment.md
+++ b/docs/developer_guide/deployment.md
@@ -41,7 +41,7 @@ This command will build an image. The image will be tagged with a default versio
## Setup RBAC for Scheduler
-The first step is to create the RBAC role for the scheduler, see [yunikorn-rbac.yaml](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/deployments/scheduler/yunikorn-rbac.yaml)
+The first step is to create the RBAC role for the scheduler, see [yunikorn-rbac.yaml](https://github.com/apache/yunikorn-k8shim/blob/master/deployments/scheduler/yunikorn-rbac.yaml)
```
kubectl create -f scheduler/yunikorn-rbac.yaml
```
@@ -54,7 +54,7 @@ This kubernetes environment can be either local or remote.
- download configuration file if not available on the node to add to kubernetes:
```
-curl -o queues.yaml https://raw.githubusercontent.com/apache/incubator-yunikorn-k8shim/master/conf/queues.yaml
+curl -o queues.yaml https://raw.githubusercontent.com/apache/yunikorn-k8shim/master/conf/queues.yaml
```
- create ConfigMap in kubernetes:
```
@@ -83,7 +83,7 @@ Second step is to link the mount point back to the configuration map created in
name: yunikorn-configs
```
-Both steps are part of the scheduler yaml file, an example can be seen at [scheduler.yaml](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/deployments/scheduler/scheduler.yaml)
+Both steps are part of the scheduler yaml file, an example can be seen at [scheduler.yaml](https://github.com/apache/yunikorn-k8shim/blob/master/deployments/scheduler/scheduler.yaml)
for reference.
## Deploy the Scheduler
@@ -118,7 +118,7 @@ below to manually deploy the admission controller if running non-example workloa
## Setup RBAC for Admission Controller
-Before the admission controller is deployed, we must create its RBAC role, see [admission-controller-rbac.yaml](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/deployments/scheduler/admission-controller-rbac.yaml).
+Before the admission controller is deployed, we must create its RBAC role, see [admission-controller-rbac.yaml](https://github.com/apache/yunikorn-k8shim/blob/master/deployments/scheduler/admission-controller-rbac.yaml).
```
kubectl create -f scheduler/admission-controller-rbac.yaml
@@ -127,7 +127,7 @@ kubectl create -f scheduler/admission-controller-rbac.yaml
## Create the Secret
Since the admission controller intercepts calls to the API server to validate/mutate incoming requests, we must deploy an empty secret
-used by the webhook server to store TLS certificates and keys. See [admission-controller-secrets.yaml](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/deployments/scheduler/admission-controller-secrets.yaml).
+used by the webhook server to store TLS certificates and keys. See [admission-controller-secrets.yaml](https://github.com/apache/yunikorn-k8shim/blob/master/deployments/scheduler/admission-controller-secrets.yaml).
```
kubectl create -f scheduler/admission-controller-secrets.yaml
@@ -135,7 +135,7 @@ kubectl create -f scheduler/admission-controller-secrets.yaml
## Deploy the Admission Controller
-Now we can deploy the admission controller as a service. This will automatically validate/modify incoming requests and objects, respectively, in accordance with the [example in Deploy the Scheduler](#Deploy-the-Scheduler). See the contents of the admission controller deployment and service in [admission-controller.yaml](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/deployments/scheduler/admission-controller.yaml).
+Now we can deploy the admission controller as a service. This will automatically validate/modify incoming requests and objects, respectively, in accordance with the [example in Deploy the Scheduler](#Deploy-the-Scheduler). See the contents of the admission controller deployment and service in [admission-controller.yaml](https://github.com/apache/yunikorn-k8shim/blob/master/deployments/scheduler/admission-controller.yaml).
```
kubectl create -f scheduler/admission-controller.yaml
diff --git a/docs/get_started/get_started.md b/docs/get_started/get_started.md
index 920059b..39c11f1 100644
--- a/docs/get_started/get_started.md
+++ b/docs/get_started/get_started.md
@@ -33,7 +33,7 @@ The easiest way to get started is to use our Helm Charts to deploy YuniKorn on a
It is recommended to use Helm 3 or later versions.
```shell script
-helm repo add yunikorn https://apache.github.io/incubator-yunikorn-release
+helm repo add yunikorn https://apache.github.io/yunikorn-release
helm repo update
kubectl create namespace yunikorn
helm install yunikorn yunikorn/yunikorn --namespace yunikorn
diff --git a/docs/performance/performance_tutorial.md b/docs/performance/performance_tutorial.md
index e2aa9f2..b179238 100644
--- a/docs/performance/performance_tutorial.md
+++ b/docs/performance/performance_tutorial.md
@@ -263,10 +263,10 @@ kubectl apply -f hollow-node.yaml
#### Install YuniKorn with helm
We can install YuniKorn with Helm, please refer to this [doc](https://yunikorn.apache.org/docs/#install).
-We need to tune some parameters based on the default configuration. We recommend to clone the [release repo](https://github.com/apache/incubator-yunikorn-release) and modify the parameters in `value.yaml`.
+We need to tune some parameters based on the default configuration. We recommend to clone the [release repo](https://github.com/apache/yunikorn-release) and modify the parameters in `value.yaml`.
```
-git clone https://github.com/apache/incubator-yunikorn-release.git
+git clone https://github.com/apache/yunikorn-release.git
cd helm-charts/yunikorn
```
@@ -364,13 +364,13 @@ In performance tools, there are three types of tests and feedbacks.
| thourghput | Measure schedulers' throughput by calculating how many pods are allocated per second based on the pod start time | Exist | None |
### 2. Build tool
-The performance tool is available in [yunikorn release repo](https://github.com/apache/incubator-yunikorn-release.git),clone the repo to your workspace.
+The performance tool is available in [yunikorn release repo](https://github.com/apache/yunikorn-release.git),clone the repo to your workspace.
```
-git clone https://github.com/apache/incubator-yunikorn-release.git
+git clone https://github.com/apache/yunikorn-release.git
```
Build the tool:
```
-cd incubator-yunikorn-release/perf-tools/
+cd yunikorn-release/perf-tools/
make build
cd target/perf-tools-bin
```
diff --git a/docs/performance/profiling.md b/docs/performance/profiling.md
index 4050ccd..662b341 100644
--- a/docs/performance/profiling.md
+++ b/docs/performance/profiling.md
@@ -81,10 +81,10 @@ top can list top memory consumption objects.
Showing nodes accounting for 83.58MB, 98.82% of 84.58MB total
Showing top 10 nodes out of 86
flat flat% sum% cum cum%
- 32MB 37.84% 37.84% 32MB 37.84% github.com/apache/incubator-yunikorn-core/pkg/cache.NewClusterInfo
- 16MB 18.92% 56.75% 16MB 18.92% github.com/apache/incubator-yunikorn-core/pkg/rmproxy.NewRMProxy
- 16MB 18.92% 75.67% 16MB 18.92% github.com/apache/incubator-yunikorn-core/pkg/scheduler.NewScheduler
- 16MB 18.92% 94.59% 16MB 18.92% github.com/apache/incubator-yunikorn-k8shim/pkg/dispatcher.init.0.func1
+ 32MB 37.84% 37.84% 32MB 37.84% github.com/apache/yunikorn-core/pkg/cache.NewClusterInfo
+ 16MB 18.92% 56.75% 16MB 18.92% github.com/apache/yunikorn-core/pkg/rmproxy.NewRMProxy
+ 16MB 18.92% 75.67% 16MB 18.92% github.com/apache/yunikorn-core/pkg/scheduler.NewScheduler
+ 16MB 18.92% 94.59% 16MB 18.92% github.com/apache/yunikorn-k8shim/pkg/dispatcher.init.0.func1
1.04MB 1.23% 95.81% 1.04MB 1.23% k8s.io/apimachinery/pkg/runtime.(*Scheme).AddKnownTypeWithName
0.52MB 0.61% 96.43% 0.52MB 0.61% github.com/gogo/protobuf/proto.RegisterType
0.51MB 0.61% 97.04% 0.51MB 0.61% sync.(*Map).Store
diff --git a/docs/user_guide/queue_config.md b/docs/user_guide/queue_config.md
index 7dd86ac..209325f 100644
--- a/docs/user_guide/queue_config.md
+++ b/docs/user_guide/queue_config.md
@@ -30,7 +30,7 @@ It references both the [Access Control Lists](user_guide/acls.md) and [Placement
This document explains how to create the partition and queue configuration for the scheduler with examples.
The scheduler relies on the shim to reliably provide user information as part of the application submission.
-The current shim identifies the user and the groups the user belongs to using the methodology provided in [User & Group Resolution](usergroup_resolution)
+The current shim identifies the user and the groups the user belongs to using the methodology provided in [User & Group Resolution](usergroup_resolution).
## Configuration
The configuration file for the scheduler that is described here only provides the configuration for the partitions and queues.
@@ -39,7 +39,7 @@ By default we use the file called `queues.yaml` in our deployments.
The filename can be changed via the command line flag `policyGroup` of the scheduler.
Changing the filename must be followed by corresponding changes in the deployment details, either the `configmap` or the file included in the docker container.
-The example file for the configuration is located in the scheduler core's [queues.yaml](https://github.com/apache/incubator-yunikorn-core/blob/master/config/queues.yaml).
+The example file for the configuration is located in the scheduler core's [queues.yaml](https://github.com/apache/yunikorn-core/blob/master/config/queues.yaml).
## Partitions
Partitions are the top level of the scheduler configuration.
diff --git a/docs/user_guide/resource_quota_mgmt.md b/docs/user_guide/resource_quota_mgmt.md
index cc07f48..0741975 100644
--- a/docs/user_guide/resource_quota_mgmt.md
+++ b/docs/user_guide/resource_quota_mgmt.md
@@ -219,7 +219,7 @@ In this case the property `application.sort.policy` is in this configuration set
This is a simple app sorting policy applicable for batch jobs, you can find more document [here](sorting_policies.md#StateAwarePolicy).
You can change the configuration using the helm charts during the installation by overwriting the configuration in the
-[helm chart template](https://github.com/apache/incubator-yunikorn-release/blob/master/helm-charts/yunikorn/values.yaml#L71-L81).
+[helm chart template](https://github.com/apache/yunikorn-release/blob/master/helm-charts/yunikorn/values.yaml#L71-L81).
### Namespace quota
Namespaces in Kubernetes contain the quota information.
diff --git a/docs/user_guide/usergroup_resolution.md b/docs/user_guide/usergroup_resolution.md
index 0816a20..564f5ce 100644
--- a/docs/user_guide/usergroup_resolution.md
+++ b/docs/user_guide/usergroup_resolution.md
@@ -24,7 +24,7 @@ under the License.
## User resolution
-User information is an important aspect of the scheduling cycle. It is one of the key identifier that can be used to determine the queue to which a job should be submitted. The Yunikorn Scheduler relies on the K8s Shim to provide user information. In the world of Kubernetes, there is no object defined that identfies the actual user. This is by design and more information can be found [here](https://kubernetes.io/docs/reference/access-authn-authz/authentication/#users-in-kubernetes)
+User information is an important aspect of the scheduling cycle. It is one of the key identifier that can be used to determine the queue to which a job should be submitted. The Yunikorn Scheduler relies on the K8s Shim to provide user information. In the world of Kubernetes, there is no object defined that identfies the actual user. This is by design and more information can be found [here](https://kubernetes.io/docs/reference/access-authn-authz/authentication/#users-in-kubernetes).
Since, Kubernetes has no pre-defined field or resource for user information and individual cluster deployments with unique user identification tools can vary, we have defined a standard way of identifying the user. Yunikorn requires a Kubernetes [Label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) added. Using the [recommendation](https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/) provided here, the default label is defined as below:
@@ -47,7 +47,7 @@ Assumption:
Yunikorn assumes that all pods belonging to an application are owned by the same user. We recommend that the user label is added to every pod of an app. This is to ensure that there is no discrepency.
:::
-The `yunikorn.apache.org/username` key can be customized by overriding the default value using the `USER_LABEL_KEY`env variable to the [K8s](https://github.com/apache/incubator-yunikorn-release/blob/master/helm-charts/yunikorn/templates/deployment.yaml). This is particularly useful in scenarios where the user label is already being added or if the label has to be modified for some secuirty reasons.
+The `yunikorn.apache.org/username` key can be customized by overriding the default value using the `USER_LABEL_KEY`env variable in the [K8s Deployment](https://github.com/apache/yunikorn-release/blob/master/helm-charts/yunikorn/templates/deployment.yaml). This is particularly useful in scenarios where the user label is already being added or if the label has to be modified for some secuirty reasons.
```yaml
env:
diff --git a/docs/user_guide/workloads/run_tensorflow.md b/docs/user_guide/workloads/run_tensorflow.md
index 5448990..367ac6e 100644
--- a/docs/user_guide/workloads/run_tensorflow.md
+++ b/docs/user_guide/workloads/run_tensorflow.md
@@ -38,7 +38,7 @@ kubectl apply -k "github.com/kubeflow/training-operator/manifests/overlays/stand
## Prepare the docker image
Before you start running a TensorFlow job on Kubernetes, you'll need to build the docker image.
-1. Download files from [deployment/examples/tfjob](https://github.com/apache/incubator-yunikorn-k8shim/tree/master/deployments/examples/tfjob)
+1. Download files from [deployment/examples/tfjob](https://github.com/apache/yunikorn-k8shim/tree/master/deployments/examples/tfjob)
2. To build this docker image with the following command
```
@@ -46,7 +46,7 @@ docker build -f Dockerfile -t kubeflow/tf-dist-mnist-test:1.0 .
```
## Run a TensorFlow job
-Here is a TFJob yaml for MNIST [example](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/deployments/examples/tfjob/tf-job-mnist.yaml).
+Here is a TFJob yaml for MNIST [example](https://github.com/apache/yunikorn-k8shim/blob/master/deployments/examples/tfjob/tf-job-mnist.yaml).
```yaml
apiVersion: kubeflow.org/v1
diff --git a/docusaurus.config.js b/docusaurus.config.js
index 1026c91..b0633cc 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -17,13 +17,13 @@
const versions = require('./versions.json');
module.exports = {
- title: 'Apache YuniKorn (Incubating)',
+ title: 'Apache YuniKorn',
tagline: 'Unleash the power of resource scheduling for running Big Data & ML on Kubernetes!',
url: 'https://yunikorn.apache.org',
baseUrl: '/',
favicon: 'img/yunikorn.ico',
organizationName: 'apache',
- projectName: 'incubator-yunikorn-core',
+ projectName: 'yunikorn-core',
i18n: {
defaultLocale: 'en',
locales: ['en', 'zh-cn'],
@@ -128,10 +128,6 @@ module.exports = {
href: 'https://www.apache.org/'
},
{
- label: 'Apache Incubator',
- href: 'https://incubator.apache.org/'
- },
- {
label: 'Events',
href: 'https://www.apache.org/events/current-event'
},
@@ -180,7 +176,7 @@ module.exports = {
position: 'right',
},
{
- href: 'https://github.com/apache/incubator-yunikorn-core',
+ href: 'https://github.com/apache/yunikorn-core',
position: 'right',
className: 'header-github-link',
'aria-label': 'GitHub repository',
@@ -208,23 +204,23 @@ module.exports = {
items: [
{
label: 'Core scheduler',
- href: 'https://github.com/apache/incubator-yunikorn-core/'
+ href: 'https://github.com/apache/yunikorn-core/'
},
{
label: 'Kubernetes shim',
- href: 'https://github.com/apache/incubator-yunikorn-k8shim'
+ href: 'https://github.com/apache/yunikorn-k8shim'
},
{
label: 'Scheduler Interface',
- href: 'https://github.com/apache/incubator-yunikorn-scheduler-interface'
+ href: 'https://github.com/apache/yunikorn-scheduler-interface'
},
{
label: 'WEB application',
- href: 'https://github.com/apache/incubator-yunikorn-web'
+ href: 'https://github.com/apache/yunikorn-web'
},
{
label: 'Website',
- href: 'https://github.com/apache/incubator-yunikorn-site'
+ href: 'https://github.com/apache/yunikorn-site'
}
]
},
@@ -246,18 +242,11 @@ module.exports = {
]
},
],
- logo: {
- alt: 'Apache Incubator Logo',
- src: 'https://incubator.apache.org/images/incubator_feather_egg_logo.png',
- href: 'https://incubator.apache.org/',
- },
copyright: `
<div style="font-size: 70%">
Copyright © 2020-${new Date().getFullYear()} <a href="https://www.apache.org/">The Apache Software Foundation</a>. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. <br>
<div style="padding:20px; margin: 10px; color: #4d4d4d;">
-<p>Apache YuniKorn is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the pro [...]
-
-<p>The Apache Software Foundation Apache YuniKorn, YuniKorn, Apache, the Apache feather, and the Apache YuniKorn project logo are either registered trademarks or trademarks of the Apache Software Foundation. Apache YuniKorn is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the name of Apache TLP sponsor.</p>
+<p>The Apache Software Foundation Apache YuniKorn, YuniKorn, Apache, the Apache feather, and the Apache YuniKorn project logo are either registered trademarks or trademarks of the Apache Software Foundation.</p>
</div>
</div>`
},
diff --git a/i18n/zh-cn/docusaurus-plugin-content-docs/current/get_started/get_started.md b/i18n/zh-cn/docusaurus-plugin-content-docs/current/get_started/get_started.md
index 8572514..fcf009f 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-docs/current/get_started/get_started.md
+++ b/i18n/zh-cn/docusaurus-plugin-content-docs/current/get_started/get_started.md
@@ -33,7 +33,7 @@ under the License.
我们建议使用 Helm 3 或更高版本。
```shell script
-helm repo add yunikorn https://apache.github.io/incubator-yunikorn-release
+helm repo add yunikorn https://apache.github.io/yunikorn-release
helm repo update
kubectl create namespace yunikorn
helm install yunikorn yunikorn/yunikorn --namespace yunikorn
diff --git a/i18n/zh-cn/docusaurus-plugin-content-docs/current/performance/performance_tutorial.md b/i18n/zh-cn/docusaurus-plugin-content-docs/current/performance/performance_tutorial.md
index ac305e7..16293b6 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-docs/current/performance/performance_tutorial.md
+++ b/i18n/zh-cn/docusaurus-plugin-content-docs/current/performance/performance_tutorial.md
@@ -263,10 +263,10 @@ kubectl apply -f hollow-node.yaml
#### Install YuniKorn with helm
We can install YuniKorn with Helm, please refer to this [doc](https://yunikorn.apache.org/docs/#install).
-We need to tune some parameters based on the default configuration. We recommend to clone the [release repo](https://github.com/apache/incubator-yunikorn-release) and modify the parameters in `value.yaml`.
+We need to tune some parameters based on the default configuration. We recommend to clone the [release repo](https://github.com/apache/yunikorn-release) and modify the parameters in `value.yaml`.
```
-git clone https://github.com/apache/incubator-yunikorn-release.git
+git clone https://github.com/apache/yunikorn-release.git
cd helm-charts/yunikorn
```
diff --git a/i18n/zh-cn/docusaurus-plugin-content-docs/current/user_guide/workloads/run_tensorflow.md b/i18n/zh-cn/docusaurus-plugin-content-docs/current/user_guide/workloads/run_tensorflow.md
index 3330aa4..9997e0c 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-docs/current/user_guide/workloads/run_tensorflow.md
+++ b/i18n/zh-cn/docusaurus-plugin-content-docs/current/user_guide/workloads/run_tensorflow.md
@@ -38,7 +38,7 @@ kubectl apply -k "github.com/kubeflow/training-operator/manifests/overlays/stand
## Prepare the docker image
Before you start running a TensorFlow job on Kubernetes, you'll need to build the docker image.
-1. Download files from [deployment/examples/tfjob](https://github.com/apache/incubator-yunikorn-k8shim/tree/master/deployments/examples/tfjob)
+1. Download files from [deployment/examples/tfjob](https://github.com/apache/yunikorn-k8shim/tree/master/deployments/examples/tfjob)
2. To build this docker image with the following command
```
@@ -46,7 +46,7 @@ docker build -f Dockerfile -t kubeflow/tf-dist-mnist-test:1.0 .
```
## Run a TensorFlow job
-Here is a TFJob yaml for MNIST [example](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/deployments/examples/tfjob/tf-job-mnist.yaml).
+Here is a TFJob yaml for MNIST [example](https://github.com/apache/yunikorn-k8shim/blob/master/deployments/examples/tfjob/tf-job-mnist.yaml).
```yaml
apiVersion: kubeflow.org/v1
diff --git a/i18n/zh-cn/docusaurus-plugin-content-pages/community/coding_guidelines.md b/i18n/zh-cn/docusaurus-plugin-content-pages/community/coding_guidelines.md
index 7cc9f37..ee3b0cb 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-pages/community/coding_guidelines.md
+++ b/i18n/zh-cn/docusaurus-plugin-content-pages/community/coding_guidelines.md
@@ -94,8 +94,8 @@ lint 检查是项目的标准 CI 构建运行的一部分。
### 配置
为使用它们的两个项目提供了预定义的配置：
-* [YuniKorn k8shim](https://github.com/apache/incubator-yunikorn-k8shim), 配置文件 [golangci.yml](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/.golangci.yml).
-* [YuniKorn core](https://github.com/apache/incubator-yunikorn-core), 配置文件 [golangci.yml](https://github.com/apache/incubator-yunikorn-core/blob/master/.golangci.yml).
+* [YuniKorn k8shim](https://github.com/apache/yunikorn-k8shim), 配置文件 [golangci.yml](https://github.com/apache/yunikorn-k8shim/blob/master/.golangci.yml).
+* [YuniKorn core](https://github.com/apache/yunikorn-core), 配置文件 [golangci.yml](https://github.com/apache/yunikorn-core/blob/master/.golangci.yml).
Web 界面是一个 javascript 项目，调度接口只生成了 Go 代码，因此不使用它。
diff --git a/i18n/zh-cn/docusaurus-plugin-content-pages/community/download.md b/i18n/zh-cn/docusaurus-plugin-content-pages/community/download.md
index dfc4163..b9eac92 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-pages/community/download.md
+++ b/i18n/zh-cn/docusaurus-plugin-content-pages/community/download.md
@@ -1,6 +1,6 @@
---
id: download
-title: Apache YuniKorn (Incubating)
+title: Apache YuniKorn
---
<!--
@@ -22,9 +22,9 @@ specific language governing permissions and limitations
under the License.
-->
-# Apache YuniKorn (Incubating)
+# Apache YuniKorn
-Apache YuniKorn (Incubating) 作为源代码压缩包发布。
+Apache YuniKorn 作为源代码压缩包发布。
最新版本的下载通过镜像站点进行分发。
旧版本可以从 Apache 存档站点进行下载。
应使用 GPG 或 SHA-512 检查所有发布工件是否被篡改。
diff --git a/i18n/zh-cn/docusaurus-plugin-content-pages/community/get_involved.md b/i18n/zh-cn/docusaurus-plugin-content-pages/community/get_involved.md
index 6d58a96..4aec2b1 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-pages/community/get_involved.md
+++ b/i18n/zh-cn/docusaurus-plugin-content-pages/community/get_involved.md
@@ -24,7 +24,7 @@ under the License.
# 进行参与
-Apache YuniKorn（Incubating）社区非常多样化，我们有来自阿里巴巴、苹果、Cloudera、Linkedin、微软、Nvidia、腾讯、优步等（按英文字母顺序排序）。
+Apache YuniKorn 社区非常多样化，我们有来自阿里巴巴、苹果、Cloudera、Linkedin、微软、Nvidia、腾讯、优步等（按英文字母顺序排序）。
社区深信这种多样性的重要性和 “The Apache Way” 的价值。
我们欢迎任何形式的贡献、代码、文档或建议！:smiley: 别等了，现在就加入我们吧！
diff --git a/i18n/zh-cn/docusaurus-plugin-content-pages/community/people.md b/i18n/zh-cn/docusaurus-plugin-content-pages/community/people.md
index 7ba60c0..274c35c 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-pages/community/people.md
+++ b/i18n/zh-cn/docusaurus-plugin-content-pages/community/people.md
@@ -24,9 +24,9 @@ under the License.
YuniKorn 社区是开放的、多样化的和协作的。
它不隶属于任何组织，并由项目成员分担管理和维护项目的责任。
-社区中的成员包括孵化项目管理委员会 ([PPMC](https://incubator.apache.org/guides/ppmc.html)) 的成员和 [Committers](https://infra.apache.org/new-committers-guide.html#what-is-a-committer)。
+社区中的成员包括孵化项目管理委员会 ([PMC](https://www.apache.org/dev/pmc.html)) 的成员和 [Committers](https://infra.apache.org/new-committers-guide.html#what-is-a-committer)。
-## PPMC
+## PMC
| 公开名称 | ApacheID | 组织 | 时区 (UTC) |
|-------------------------|------------|-----------|----------|
@@ -50,7 +50,7 @@ YuniKorn 社区是开放的、多样化的和协作的。
## Committer
-> 以下列表不包括 PPMC 成员
+> 以下列表不包括 PMC 成员
| 名称 | ApacheID | 组织 | 时区 |
|----------------|----------|------------|------|
@@ -65,7 +65,7 @@ YuniKorn 社区是开放的、多样化的和协作的。
Committers 是对项目存储库具有写入权限的社区成员，
即他们可以自己修改代码并接受其他人对所有 YuniKorn 存储库的贡献。
-PPMC 根据各种考虑对候选人进行投票：
+PMC 根据各种考虑对候选人进行投票：
- 代码贡献
- 一致的代码贡献
@@ -85,14 +85,14 @@ PPMC 根据各种考虑对候选人进行投票：
contributor 或非 contributor 都可以成为 committer，社区非常感谢代码或非代码贡献。
-## 成为 PPMC 成员
+## 成为 PMC 成员
-PPMC 为 Podling Project Management Committee。
+PMC 为 Podling Project Management Committee。
它负责项目管理、治理并确保项目可以在 [Apache Way](https://www.apache.org/theapacheway/) 下运行。
-委员会根据 PPMC 成员的投票做出决定。
-PPMC 成员有权对各种事情进行有约束力的投票，例如项目发布、添加新的提交者或 PPMC 成员等。
+委员会根据 PMC 成员的投票做出决定。
+PMC 成员有权对各种事情进行有约束力的投票，例如项目发布、添加新的提交者或 PMC 成员等。
-在成为 PPMC 成员之前，贡献者必须先成为提交者。
-提交者何时有资格被添加到 PPMC 没有严格的规定。
+在成为 PMC 成员之前，贡献者必须先成为提交者。
+提交者何时有资格被添加到 PMC 没有严格的规定。
管理委员会根据每个提交者的参与和影响做出决定。
-一般来说，对项目做出持续的代码或非代码贡献的贡献者应被视为 PPMC 候选人。
+一般来说，对项目做出持续的代码或非代码贡献的贡献者应被视为 PMC 候选人。
diff --git a/i18n/zh-cn/docusaurus-plugin-content-pages/index.js b/i18n/zh-cn/docusaurus-plugin-content-pages/index.js
index aa1bbb0..53ec4b2 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-pages/index.js
+++ b/i18n/zh-cn/docusaurus-plugin-content-pages/index.js
@@ -107,7 +107,7 @@ function Home() {
return (
<Layout
title={`Welcome to ${siteConfig.title}`}
- description="Apache YuniKorn (孵化项目) 网页">
+ description="Apache YuniKorn 网页">
<header className={clsx('hero', styles.heroBanner)}>
<div className="container">
<div className="row">
diff --git a/i18n/zh-cn/docusaurus-theme-classic/navbar.json b/i18n/zh-cn/docusaurus-theme-classic/navbar.json
index e245170..63f5508 100644
--- a/i18n/zh-cn/docusaurus-theme-classic/navbar.json
+++ b/i18n/zh-cn/docusaurus-theme-classic/navbar.json
@@ -38,9 +38,6 @@
"item.label.Apache Software Foundation": {
"message": "Apache软件基金会"
},
- "item.label.Apache Incubator": {
- "message": "Apache孵化项目"
- },
"item.label.Sponsorship": {
"message": "赞助"
},
diff --git a/local-build.sh b/local-build.sh
index a73d5c5..7b9ec99 100755
--- a/local-build.sh
+++ b/local-build.sh
@@ -35,8 +35,8 @@ function build() {
# build local docker image
cat <<EOF >.dockerfile.tmp
FROM node:16.13.0
-ADD . /incubator-yunikorn-site
-WORKDIR /incubator-yunikorn-site
+ADD . /yunikorn-site
+WORKDIR /yunikorn-site
EOF
docker build -t yunikorn/yunikorn-website:latest -f .dockerfile.tmp .
@@ -50,7 +50,7 @@ function run() {
# so that changes made in the repo can trigger the web-server auto-update
docker run -it --name yunikorn-site-local -d \
-p 3000:3000 \
- -v $PWD:/incubator-yunikorn-site \
+ -v $PWD:/yunikorn-site \
yunikorn/yunikorn-website:latest
[ "$?" -ne 0 ] && echo "run local docker image failed" && return 1
diff --git a/src/pages/community/coding_guidelines.md b/src/pages/community/coding_guidelines.md
index 5f645ca..c19b772 100644
--- a/src/pages/community/coding_guidelines.md
+++ b/src/pages/community/coding_guidelines.md
@@ -93,8 +93,8 @@ See the golangci-lint product documentation for more options and information on
### Configuration
A predefined configuration is provided for the two projects that use them:
-* [YuniKorn k8shim](https://github.com/apache/incubator-yunikorn-k8shim), configuration file [golangci.yml](https://github.com/apache/incubator-yunikorn-k8shim/blob/master/.golangci.yml).
-* [YuniKorn core](https://github.com/apache/incubator-yunikorn-core), configuration file [golangci.yml](https://github.com/apache/incubator-yunikorn-core/blob/master/.golangci.yml).
+* [YuniKorn k8shim](https://github.com/apache/yunikorn-k8shim), configuration file [golangci.yml](https://github.com/apache/yunikorn-k8shim/blob/master/.golangci.yml).
+* [YuniKorn core](https://github.com/apache/yunikorn-core), configuration file [golangci.yml](https://github.com/apache/yunikorn-core/blob/master/.golangci.yml).
The web interface is a javascript project and the scheduler interface only has generated Go code and thus do not use it.
diff --git a/src/pages/community/download.md b/src/pages/community/download.md
index 74cc05e..611b5db 100644
--- a/src/pages/community/download.md
+++ b/src/pages/community/download.md
@@ -1,6 +1,6 @@
---
id: download
-title: Apache YuniKorn (Incubating)
+title: Apache YuniKorn
---
<!--
@@ -22,9 +22,9 @@ specific language governing permissions and limitations
under the License.
-->
-# Apache YuniKorn (Incubating)
+# Apache YuniKorn
-Apache YuniKorn (Incubating) is released as source code tarballs.
+Apache YuniKorn is released as source code tarballs.
The downloads for the latest release are distributed via mirror sites.
Older releases can be downloaded from the Apache archive site.
All release artifacts should be checked for tampering using GPG or SHA-512.
diff --git a/src/pages/community/get_involved.md b/src/pages/community/get_involved.md
index ff7a685..62d94c6 100644
--- a/src/pages/community/get_involved.md
+++ b/src/pages/community/get_involved.md
@@ -24,7 +24,7 @@ under the License.
# Get Involved
-Apache YuniKorn (Incubating) community is quite diverse, we have engineers from Alibaba, Apple,
+The Apache YuniKorn community is quite diverse, we have engineers from Alibaba, Apple,
Cloudera, Linkedin, Microsoft, Nvidia, Tencent, Uber, etc. (sorted by alphabetical order). The community deeply believes in the
importance of this diversity and the value of "The Apache Way". We welcome any form of contributions, code, documentation or suggestions!
:smiley: Don't wait, join us now!
diff --git a/src/pages/community/people.md b/src/pages/community/people.md
index ef3be78..607c8c4 100644
--- a/src/pages/community/people.md
+++ b/src/pages/community/people.md
@@ -24,13 +24,13 @@ under the License.
## Project Members
-YuniKorn community is open, diverse, and collaborative. It is not owned
+The YuniKorn community is open, diverse, and collaborative. It is not owned
by any entity. Project members share the responsibility to manage, and maintain the project.
-People in the community include Podling Project Management Committee ([PPMC](https://incubator.apache.org/guides/ppmc.html))
+People in the community include Project Management Committee ([PMC](https://www.apache.org/dev/pmc.html))
members and [committers](https://infra.apache.org/new-committers-guide.html#what-is-a-committer).
-## PPMC
+## PMC
| Public Name | ApacheID | Organization | Timezone (UTC) |
|-------------------------|------------|--------------|----------------|
@@ -54,7 +54,7 @@ members and [committers](https://infra.apache.org/new-committers-guide.html#what
## Committer
-> The listing below excludes the PPMC members
+> The listing below excludes the PMC members
| Name | ApacheID | Organization | Timezone |
|----------------|----------|--------------|----------|
@@ -69,7 +69,7 @@ members and [committers](https://infra.apache.org/new-committers-guide.html#what
Committers are the community members who have the write access to the project's repositories, i.e
they can modify the code by themselves and accept others contributions to all YuniKorn repos.
-There is no strict rules about the qualification of a candidate. The PPMC votes for a candidate
+There is no strict rules about the qualification of a candidate. The PMC votes for a candidate
based on various considerations:
- Code contributions
@@ -91,14 +91,14 @@ based on various considerations:
Contributor or non-contributor can both make their paths to committer, the community deeply
appreciates both code or non-code contributions.
-## Become a PPMC member
+## Become a PMC member
-PPMC stands for the Podling Project Management Committee. It is responsible for project
+PMC stands for the Podling Project Management Committee. It is responsible for project
management, governance and ensures the project can be operated under the [Apache Way](https://www.apache.org/theapacheway/).
-The committee makes decisions based on the PPMC members' votes. A PPMC member has the authority to cast a binding
-vote on various things, such as project releases, adding new committer or PPMC member, etc.
+The committee makes decisions based on the PMC members' votes. A PMC member has the authority to cast a binding
+vote on various things, such as project releases, adding new committer or PMC member, etc.
-A contributor must become a committer first before becoming a PPMC member.
-There is no strict rules of when a committer will be qualified for being added to PPMC. The management
+A contributor must become a committer first before becoming a PMC member.
+There is no strict rules of when a committer will be qualified for being added to PMC. The management
committee makes a decision based on the involvement and impact of each committer. In general, a committer
-who makes consistent code or non-code contributions to the project should be considered as a PPMC candidate.
+who makes consistent code or non-code contributions to the project should be considered as a PMC candidate.
diff --git a/src/pages/community/release_procedure.md b/src/pages/community/release_procedure.md
index a6618de..7a0f804 100644
--- a/src/pages/community/release_procedure.md
+++ b/src/pages/community/release_procedure.md
@@ -22,11 +22,11 @@ limitations under the License.
# YuniKorn Release Procedure
-The [release repository](https://github.com/apache/incubator-yunikorn-release) contains the code and configuration to create a release for Apache YuniKorn (Incubating).
+The [release repository](https://github.com/apache/yunikorn-release) contains the code and configuration to create a release for Apache YuniKorn.
Before starting the release procedure clone the repository and checkout the master branch.
Even if a release has been made before make sure that the latest version is checked out as the code and or config might have changed.
-The instructions and tools obey the ASF [release policy](http://www.apache.org/legal/release-policy.html), and [Podling Release Policy](https://incubator.apache.org/policy/incubation.html#releases).
+The instructions and tools obey the ASF [release policy](http://www.apache.org/legal/release-policy.html).
* [Create a Release](#create-a-release)
* [Tag and update release for version](#tag-and-update-release-for-version)
@@ -52,8 +52,8 @@ Simplified release procedure:
2. Stabilize the release by fixing test failures and bugs only
3. Tag update release for a new version to prepare a release candidate, e.g `v0.8.0`
4. Update the CHANGELOG
-5. Configure [release-configs.json](https://github.com/apache/incubator-yunikorn-release/tree/master/tools/release-configs.json)
-6. Run script [build-release.py](https://github.com/apache/incubator-yunikorn-release/tree/master/tools/build-release.py) to generate source code tarball, checksum and signature.
+5. Configure [release-configs.json](https://github.com/apache/yunikorn-release/tree/master/tools/release-configs.json)
+6. Run script [build-release.py](https://github.com/apache/yunikorn-release/tree/master/tools/build-release.py) to generate source code tarball, checksum and signature.
7. Voting and releasing the candidate
### Tag and update release for version
@@ -65,14 +65,14 @@ Release candidates and final release use the same tag which gets moved if a new
The tagging is multi step process, all actions are done on the branch that will be released, like `branch-0.8`:
1. Tag the web and scheduler interface with the release tag.
-2. Update the `go.mod` file in the core using `go get github.com/apache/incubator-yunikorn-scheduler-interface`
+2. Update the `go.mod` file in the core using `go get github.com/apache/yunikorn-scheduler-interface`
Add the tag and commit the changes.
-3. Update the `go.mod` file in the shim using `go get github.com/apache/incubator-yunikorn-scheduler-interface` and
-`go get github.com/apache/incubator-yunikorn-core`. Add the tag and commit the changes.
-4. Create a new branch in the yunikorn-release repo, set the correct chart version in [Chart.yaml](https://github.com/apache/incubator-yunikorn-release/tree/master/helm-charts/yunikorn/Chart.yaml), and then create the tag.
+3. Update the `go.mod` file in the shim using `go get github.com/apache/yunikorn-scheduler-interface` and
+`go get github.com/apache/yunikorn-core`. Add the tag and commit the changes.
+4. Create a new branch in the yunikorn-release repo, set the correct chart version in [Chart.yaml](https://github.com/apache/yunikorn-release/tree/master/helm-charts/yunikorn/Chart.yaml), and then create the tag.
### Update the CHANGELOG
-In the release artifacts a [CHANGELOG](https://github.com/apache/incubator-yunikorn-release/tree/master/release-top-level-artifacts/CHANGELOG) is added for each release.
+In the release artifacts a [CHANGELOG](https://github.com/apache/yunikorn-release/tree/master/release-top-level-artifacts/CHANGELOG) is added for each release.
The CHANGELOG should contain the list of jiras fixed in the release.
Follow these steps to generate the list:
- Go to the [releases page in jira](https://issues.apache.org/jira/projects/YUNIKORN?selectedItem=com.atlassian.jira.jira-projects-plugin%3Arelease-page&status=released-unreleased)
@@ -84,7 +84,7 @@ Follow these steps to generate the list:
### Run the release tool
A tool has been written to handle most of the release tasks.
-The tool requires a simple [json](https://github.com/apache/incubator-yunikorn-release/tree/master/tools/release-configs.json) input file to be updated before running.
+The tool requires a simple [json](https://github.com/apache/yunikorn-release/tree/master/tools/release-configs.json) input file to be updated before running.
This configuration points to the current release tag. Only update the tag for each repository.
The tool has one requirement outside of standard Python 3: [GitPython](https://gitpython.readthedocs.io/en/stable/intro.html)
@@ -108,23 +108,23 @@ Run the release tool using the option `--sign <email-address>` to auto sign the
Manually creating the signature for the file generated by the tool:
```shell script
-gpg --local-user <email-address> --armor --output apache-yunikorn-0.8.0-incubating-src.tar.gz.asc --detach-sig apache-yunikorn-0.8.0-incubating-src.tar.gz
+gpg --local-user <email-address> --armor --output apache-yunikorn-0.8.0-src.tar.gz.asc --detach-sig apache-yunikorn-0.8.0-src.tar.gz
```
-This will create the signature in the file: `apache-yunikorn-0.8.0-incubating-src.tar.gz.asc`
+This will create the signature in the file: `apache-yunikorn-0.8.0-src.tar.gz.asc`
Verify that the signature is correct using:
```shell script
-gpg --verify apache-yunikorn-0.8.0-incubating-src.tar.gz.asc apache-yunikorn-0.8.0-incubating-src.tar.gz
+gpg --verify apache-yunikorn-0.8.0-src.tar.gz.asc apache-yunikorn-0.8.0-src.tar.gz
```
#### Create Checksum
This step is included in the release after generation of the source tar ball, if the release tool is used this step can be skipped.
```shell script
-shasum -a 512 apache-yunikorn-0.8.0-incubating-src.tar.gz > apache-yunikorn-0.8.0-incubating-src.tar.gz.sha512
+shasum -a 512 apache-yunikorn-0.8.0-src.tar.gz > apache-yunikorn-0.8.0-src.tar.gz.sha512
```
-This will create the checksum in the file: `apache-yunikorn-0.8.0-incubating-src.tar.gz.sha512`
+This will create the checksum in the file: `apache-yunikorn-0.8.0-src.tar.gz.sha512`
Verify that the checksum is correct using:
```shell script
-shasum -a 512 -c apache-yunikorn-0.8.0-incubating-src.tar.gz.sha512
+shasum -a 512 -c apache-yunikorn-0.8.0-src.tar.gz.sha512
```
### Upload Release Candidate Artefacts
@@ -132,7 +132,7 @@ The release artefacts consist of three parts:
- source tarball
- signature file
- checksum file
-The three artefacts need to be uploaded to: `https://dist.apache.org/repos/dist/dev/incubator/yunikorn/`
+The three artefacts need to be uploaded to: `https://dist.apache.org/repos/dist/dev/yunikorn/`
Create a release directory based on the version, i.e. `0.8.0`, add the three files to directory.
Commit the changes.
@@ -143,14 +143,13 @@ Do not remove any keys from the file they are kept here to enable older releases
NOTE: you will need to install subversion to access this repo (use your apache ID). You can use any SVN client, e.g svnX, for convenience.
### Start Voting Thread
-According to [podling release doc](https://incubator.apache.org/policy/incubation.html#releases) and [release approval doc](http://www.apache.org/legal/release-policy.html#release-approval). Steps are:
+According to the Apache [release approval doc](http://www.apache.org/legal/release-policy.html#release-approval), the steps are:
- start a voting thread on `dev@yunikorn.apache.org`. (72 hours)
-- send a summary of that vote to the Incubator’s general list and request IPMC to vote. (72 hours)
-Both voting need to acquire at least three +1 votes are required and more +1 votes than -1 votes.
+At least three +1 votes are required and more +1 votes than -1 votes.
### Publish the Release
-Once the voting is passed, move the release artefacts from the staging area to the release location `https://dist.apache.org/repos/dist/release/incubator/yunikorn/`.
-Once moved to this space, the content will be automatically synced to `https://downloads.apache.org/incubator/yunikorn/` which must be used as the final location for release files.
+Once the voting is passed, move the release artefacts from the staging area to the release location `https://dist.apache.org/repos/dist/release/yunikorn/`.
+Once moved to this space, the content will be automatically synced to `https://downloads.apache.org/yunikorn/` which must be used as the final location for release files.
Read more for [location of files on main server](https://infra.apache.org/mirrors#location).
This will temporarily provide us with two releases in the release area.
@@ -190,7 +189,7 @@ The helm package will generate two files:
- provenance or signature file: example `yunikorn-0.8.0.tgz.prov`
Both files should be attached to the [release in GIT](#Create-the GIT-releases) for the release repository.
-Last step is to update the [index.yaml](https://github.com/apache/incubator-yunikorn-release/blob/gh-pages/index.yaml) file in the `gh-pages` branch with the new release.
+Last step is to update the [index.yaml](https://github.com/apache/yunikorn-release/blob/gh-pages/index.yaml) file in the `gh-pages` branch with the new release.
The `digest` mentioned in the index.yaml file is the digest that gets printed by the tool (unsigned package) or stored in the provenance file.
It can be generated manually using:
```shell script
@@ -201,16 +200,16 @@ Note: do not use the `helm repo index` command to update the `index.yaml` file.
Update the file manually.
#### Update the website
-- Create a new documentation version on YuniKorn website based on the latest content in [docs](https://github.com/apache/incubator-yunikorn-site/tree/master/docs) directory. Refer to [this](https://github.com/apache/incubator-yunikorn-site/tree/master#release-a-new-version) guide to create the new documentation.
-- Create the release announcement to be referenced from download page on the website. The release announcement is a markdown file based on the version: `0.8.0.md`. The file is stored as part of the [static pages](https://github.com/apache/incubator-yunikorn-site/tree/master/src/pages/release-announce) on the website.
-- Update the [download page](https://github.com/apache/incubator-yunikorn-site/tree/master/src/pages/community/download.md) of the website.
+- Create a new documentation version on YuniKorn website based on the latest content in [docs](https://github.com/apache/yunikorn-site/tree/master/docs) directory. Refer to [this](https://github.com/apache/yunikorn-site/tree/master#release-a-new-version) guide to create the new documentation.
+- Create the release announcement to be referenced from download page on the website. The release announcement is a markdown file based on the version: `0.8.0.md`. The file is stored as part of the [static pages](https://github.com/apache/yunikorn-site/tree/master/src/pages/release-announce) on the website.
+- Update the [download page](https://github.com/apache/yunikorn-site/tree/master/src/pages/community/download.md) of the website.
The release announcement are linked to the release details on the download page.
Links for the releases have to follow these rules:
* The first download link on the page **must** use the mirror resolution link for the source tar ball only.
* The signature and checksum links **must** point to the release location.
-* The non-current releases **must** use the archive links: `https://archive.apache.org/dist/incubator/yunikorn/` for the tar ball, the signature and the checksum.
+* The non-current releases **must** use the archive links: `https://archive.apache.org/dist/yunikorn/` for the tar ball, the signature and the checksum.
A limited set of three (3) or four (4) releases should be maintained in the table for direct access.
Older releases not mentioned in the table can still be accessed via the archive link on the bottom of the page and do not need to be referenced.
@@ -234,7 +233,7 @@ Repeat these steps for all five repositories (core, k8shim, web, scheduler-inter
- Go to the `tags` page
- click the `...` at the right-hand side of the page that you want to release, select `Create Release` from the drop down
- update the name and note
-- add the packaged helm chart files (incubator-yunikorn-release repository only)
+- add the packaged helm chart files (yunikorn-release repository only)
- click `Publish Release` to finish the steps
### Verify the release
@@ -268,7 +267,7 @@ More detail can be found in the document: [Signing a Release](https://infra.apac
```shell script
(gpg --list-sigs <email-address> && gpg --armor --export <email-address>) >> MY_KEY
```
-Add the content of the generated file to the existing KEYS list at `https://dist.apache.org/repos/dist/release/incubator/yunikorn/KEYS`
+Add the content of the generated file to the existing KEYS list at `https://dist.apache.org/repos/dist/release/yunikorn/KEYS`
Never remove a key from this list!
NOTE: you will need to install subversion to access this repo (use your apache ID). You can use any SVN client, e.g. svnX, for convenience.
diff --git a/src/pages/index.js b/src/pages/index.js
index c605f60..9e14a4c 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -107,7 +107,7 @@ function Home() {
return (
<Layout
title={`Welcome to ${siteConfig.title}`}
- description="Apache YuniKorn (incubating) website">
+ description="Apache YuniKorn website">
<header className={clsx('hero', styles.heroBanner)}>
<div className="container">
<div className="row">
diff --git a/static/img/logo/yunikorn_logo.svg b/static/img/logo/yunikorn_logo.svg
index 5e9163c..d5c4678 100644
--- a/static/img/logo/yunikorn_logo.svg
+++ b/static/img/logo/yunikorn_logo.svg
@@ -9,7 +9,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="192.25999"
inkscape:export-xdpi="192.25999"
- inkscape:export-filename="/Users/wilfred/repos/yunikorn/incubator-yunikorn-site/static/img/logo/path12.png"
+ inkscape:export-filename="/Users/wilfred/repos/yunikorn/yunikorn-site/static/img/logo/path12.png"
inkscape:version="1.0 (4035a4f, 2020-05-01)"
sodipodi:docname="yunikorn_logo2.svg"
id="svg32"