[skywalking-kubernetes] 01/01: Refactor to unify the versions of SkyWalking

2020-10-16 Thread kezhenxu94
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git

commit 56fa25cc8ce1b3647b1250c53c007d968c82
Author: kezhenxu94 
AuthorDate: Sat Oct 17 00:20:04 2020 +0800

Refactor to unify the versions of SkyWalking
---
 .gitignore |   1 +
 README.md  |  97 ++
 chart/skywalking/README.md |   2 +-
 chart/skywalking/values-es6.yaml   | 356 -
 chart/skywalking/values-es7.yaml   |  26 +++
 chart/skywalking/values-my-es.yaml |  27 +++
 chart/skywalking/values.yaml   |   8 +-
 7 files changed, 120 insertions(+), 397 deletions(-)

diff --git a/.gitignore b/.gitignore
index 538c8c5..495004e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 *~
+.idea
diff --git a/README.md b/README.md
index 1fe724e..2c9c52b 100644
--- a/README.md
+++ b/README.md
@@ -6,66 +6,91 @@ Apache SkyWalking Kubernetes
 [![GitHub 
stars](https://img.shields.io/github/stars/apache/skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/skywalking)
 [![Twitter 
Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
-SkyWalking Kubernetes repository provides ways to install and configure 
skywalking in a Kubernetes cluster.
-The scripts are written in Helm3.
+SkyWalking Kubernetes repository provides ways to install and configure 
SkyWalking in a Kubernetes cluster.
+The scripts are written in Helm 3.
 
 ## Documentation
 
- Chart Detailed Configuration
-chart detailed configuration please read [Chart 
Readme](./chart/skywalking/README.md)
+### Chart Detailed Configuration
+Chart detailed configuration can be found at [Chart 
Readme](./chart/skywalking/README.md)
 
- Deploy SkyWalking and Elasticsearch 7 (default)
+### Deploy SkyWalking in a Kubernetes cluster
 
-```shell script
-$ cd chart
+ Prerequisites
 
-$ helm repo add elastic https://helm.elastic.co
+```shell script
+git clone https://github.com/apache/skywalking-kubernetes
+cd skywalking-kubernetes/chart
+helm repo add elastic https://helm.elastic.co
+helm dep up skywalking
+export SKYWALKING_RELEASE_NAME=skywalking  # change the release name according 
to your scenario
+export SKYWALKING_RELEASE_NAMESPACE=istio-system  # change the namespace 
according to your scenario
+```
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & Elasticsearch 6 (default)
 
-$ helm install  skywalking -n 
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}"
 ``` 
 
-**Note**: If you want to deploy Elasticsearch 6, execute the following command
+ Deploy the latest SkyWalking & Elasticsearch 7
 
 ```shell script
-$ helm dep up skywalking
-
-$ helm install  skywalking -n  --values 
./skywalking/values-es6.yaml
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-es7.yaml
 ```
 
- Only deploy SkyWalking ,and use existing Elasticsearch
-If not want to deploy a new elasticsearch cluster, this way can be solved.
+ Deploy a specific version of SkyWalking & Elasticsearch
+
+- Deploy SkyWalking 8.0.1 & Elasticsearch 6.8.6
 
-Only need to close the elasticsearch deployed by chart default and configure 
the existing elasticsearch connection method.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.0.1-es6 \
+  --set ui.image.tag=8.0.1 \
+  --set elasticsearch.imageTag=6.8.6
+```
 
+- Deploy SkyWalking 8.1.0 & Elasticsearch 7.5.1
 ```shell script
-$ cd chart
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.1.0-es7 \
+  --set ui.image.tag=8.1.0 \
+  --set elasticsearch.imageTag=7.5.1
+``` 
 
-$ helm repo add elastic https://helm.elastic.co
+**NOTE**: Please make sure the specified OAP image tag supports the specified 
Elasticsearch version. 
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & an existing Elasticsearch
 
-$ helm install  skywalking -n  \
---set elasticsearch.enabled=false \
---set elasticsearch.config.host= \
---set elasticsearch.config.port.http= \
---set elasticsearch.config.user= \
---set elasticsearch.config.password= 
+1. Modify the connection information to the existing elasticsearch cluster in 
file [`values-my-es.yaml`](chart/skywalking/values-my-es.yaml).
+1. Execute the command.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-my-es.yaml
+```
+
+OR, if your existing Elasticsearch version is 7.x.x
+
+```she

[skywalking-kubernetes] 01/01: Refactor to unify the versions of SkyWalking

2020-10-16 Thread kezhenxu94
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git

commit 5edebe113c89d4c2bc758829d4745017834e6bf5
Author: kezhenxu94 
AuthorDate: Sat Oct 17 00:20:04 2020 +0800

Refactor to unify the versions of SkyWalking
---
 .gitignore |   1 +
 README.md  |  97 ++
 chart/skywalking/README.md |   4 +-
 chart/skywalking/values-es6.yaml   | 356 -
 chart/skywalking/values-es7.yaml   |  26 +++
 chart/skywalking/values-my-es.yaml |  27 +++
 chart/skywalking/values.yaml   |   8 +-
 7 files changed, 121 insertions(+), 398 deletions(-)

diff --git a/.gitignore b/.gitignore
index 538c8c5..495004e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 *~
+.idea
diff --git a/README.md b/README.md
index 1fe724e..2c9c52b 100644
--- a/README.md
+++ b/README.md
@@ -6,66 +6,91 @@ Apache SkyWalking Kubernetes
 [![GitHub 
stars](https://img.shields.io/github/stars/apache/skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/skywalking)
 [![Twitter 
Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
-SkyWalking Kubernetes repository provides ways to install and configure 
skywalking in a Kubernetes cluster.
-The scripts are written in Helm3.
+SkyWalking Kubernetes repository provides ways to install and configure 
SkyWalking in a Kubernetes cluster.
+The scripts are written in Helm 3.
 
 ## Documentation
 
- Chart Detailed Configuration
-chart detailed configuration please read [Chart 
Readme](./chart/skywalking/README.md)
+### Chart Detailed Configuration
+Chart detailed configuration can be found at [Chart 
Readme](./chart/skywalking/README.md)
 
- Deploy SkyWalking and Elasticsearch 7 (default)
+### Deploy SkyWalking in a Kubernetes cluster
 
-```shell script
-$ cd chart
+ Prerequisites
 
-$ helm repo add elastic https://helm.elastic.co
+```shell script
+git clone https://github.com/apache/skywalking-kubernetes
+cd skywalking-kubernetes/chart
+helm repo add elastic https://helm.elastic.co
+helm dep up skywalking
+export SKYWALKING_RELEASE_NAME=skywalking  # change the release name according 
to your scenario
+export SKYWALKING_RELEASE_NAMESPACE=istio-system  # change the namespace 
according to your scenario
+```
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & Elasticsearch 6 (default)
 
-$ helm install  skywalking -n 
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}"
 ``` 
 
-**Note**: If you want to deploy Elasticsearch 6, execute the following command
+ Deploy the latest SkyWalking & Elasticsearch 7
 
 ```shell script
-$ helm dep up skywalking
-
-$ helm install  skywalking -n  --values 
./skywalking/values-es6.yaml
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-es7.yaml
 ```
 
- Only deploy SkyWalking ,and use existing Elasticsearch
-If not want to deploy a new elasticsearch cluster, this way can be solved.
+ Deploy a specific version of SkyWalking & Elasticsearch
+
+- Deploy SkyWalking 8.0.1 & Elasticsearch 6.8.6
 
-Only need to close the elasticsearch deployed by chart default and configure 
the existing elasticsearch connection method.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.0.1-es6 \
+  --set ui.image.tag=8.0.1 \
+  --set elasticsearch.imageTag=6.8.6
+```
 
+- Deploy SkyWalking 8.1.0 & Elasticsearch 7.5.1
 ```shell script
-$ cd chart
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.1.0-es7 \
+  --set ui.image.tag=8.1.0 \
+  --set elasticsearch.imageTag=7.5.1
+``` 
 
-$ helm repo add elastic https://helm.elastic.co
+**NOTE**: Please make sure the specified OAP image tag supports the specified 
Elasticsearch version. 
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & an existing Elasticsearch
 
-$ helm install  skywalking -n  \
---set elasticsearch.enabled=false \
---set elasticsearch.config.host= \
---set elasticsearch.config.port.http= \
---set elasticsearch.config.user= \
---set elasticsearch.config.password= 
+1. Modify the connection information to the existing elasticsearch cluster in 
file [`values-my-es.yaml`](chart/skywalking/values-my-es.yaml).
+1. Execute the command.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-my-es.yaml
+```
+
+OR, if your existing Elasticsearch version is 7.x.x
+
+```she

[skywalking-kubernetes] 01/01: Refactor to unify the versions of SkyWalking

2020-10-16 Thread kezhenxu94
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git

commit 9f5473b549ad05b3c76099c3629d1f52a6e5a487
Author: kezhenxu94 
AuthorDate: Sat Oct 17 00:20:04 2020 +0800

Refactor to unify the versions of SkyWalking
---
 .gitignore |   1 +
 README.md  |  97 ++
 chart/skywalking/README.md |   6 +-
 chart/skywalking/values-es6.yaml   | 356 -
 chart/skywalking/values-es7.yaml   |  26 +++
 chart/skywalking/values-my-es.yaml |  27 +++
 chart/skywalking/values.yaml   |   8 +-
 7 files changed, 122 insertions(+), 399 deletions(-)

diff --git a/.gitignore b/.gitignore
index 538c8c5..495004e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 *~
+.idea
diff --git a/README.md b/README.md
index 1fe724e..2c9c52b 100644
--- a/README.md
+++ b/README.md
@@ -6,66 +6,91 @@ Apache SkyWalking Kubernetes
 [![GitHub 
stars](https://img.shields.io/github/stars/apache/skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/skywalking)
 [![Twitter 
Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
-SkyWalking Kubernetes repository provides ways to install and configure 
skywalking in a Kubernetes cluster.
-The scripts are written in Helm3.
+SkyWalking Kubernetes repository provides ways to install and configure 
SkyWalking in a Kubernetes cluster.
+The scripts are written in Helm 3.
 
 ## Documentation
 
- Chart Detailed Configuration
-chart detailed configuration please read [Chart 
Readme](./chart/skywalking/README.md)
+### Chart Detailed Configuration
+Chart detailed configuration can be found at [Chart 
Readme](./chart/skywalking/README.md)
 
- Deploy SkyWalking and Elasticsearch 7 (default)
+### Deploy SkyWalking in a Kubernetes cluster
 
-```shell script
-$ cd chart
+ Prerequisites
 
-$ helm repo add elastic https://helm.elastic.co
+```shell script
+git clone https://github.com/apache/skywalking-kubernetes
+cd skywalking-kubernetes/chart
+helm repo add elastic https://helm.elastic.co
+helm dep up skywalking
+export SKYWALKING_RELEASE_NAME=skywalking  # change the release name according 
to your scenario
+export SKYWALKING_RELEASE_NAMESPACE=istio-system  # change the namespace 
according to your scenario
+```
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & Elasticsearch 6 (default)
 
-$ helm install  skywalking -n 
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}"
 ``` 
 
-**Note**: If you want to deploy Elasticsearch 6, execute the following command
+ Deploy the latest SkyWalking & Elasticsearch 7
 
 ```shell script
-$ helm dep up skywalking
-
-$ helm install  skywalking -n  --values 
./skywalking/values-es6.yaml
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-es7.yaml
 ```
 
- Only deploy SkyWalking ,and use existing Elasticsearch
-If not want to deploy a new elasticsearch cluster, this way can be solved.
+ Deploy a specific version of SkyWalking & Elasticsearch
+
+- Deploy SkyWalking 8.0.1 & Elasticsearch 6.8.6
 
-Only need to close the elasticsearch deployed by chart default and configure 
the existing elasticsearch connection method.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.0.1-es6 \
+  --set ui.image.tag=8.0.1 \
+  --set elasticsearch.imageTag=6.8.6
+```
 
+- Deploy SkyWalking 8.1.0 & Elasticsearch 7.5.1
 ```shell script
-$ cd chart
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.1.0-es7 \
+  --set ui.image.tag=8.1.0 \
+  --set elasticsearch.imageTag=7.5.1
+``` 
 
-$ helm repo add elastic https://helm.elastic.co
+**NOTE**: Please make sure the specified OAP image tag supports the specified 
Elasticsearch version. 
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & an existing Elasticsearch
 
-$ helm install  skywalking -n  \
---set elasticsearch.enabled=false \
---set elasticsearch.config.host= \
---set elasticsearch.config.port.http= \
---set elasticsearch.config.user= \
---set elasticsearch.config.password= 
+1. Modify the connection information to the existing elasticsearch cluster in 
file [`values-my-es.yaml`](chart/skywalking/values-my-es.yaml).
+1. Execute the command.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-my-es.yaml
+```
+
+OR, if your existing Elasticsearch version is 7.x.x
+
+```she

[skywalking-kubernetes] 01/01: Refactor to unify the versions of SkyWalking

2020-10-16 Thread kezhenxu94
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git

commit 83e85c2026cc7a3d988609dc69dbb5f540b16144
Author: kezhenxu94 
AuthorDate: Sat Oct 17 00:20:04 2020 +0800

Refactor to unify the versions of SkyWalking
---
 .gitignore |   1 +
 README.md  |  97 ++
 chart/skywalking/README.md |  12 +-
 chart/skywalking/values-es6.yaml   | 356 -
 chart/skywalking/values-es7.yaml   |  26 +++
 chart/skywalking/values-my-es.yaml |  27 +++
 chart/skywalking/values.yaml   |   8 +-
 7 files changed, 125 insertions(+), 402 deletions(-)

diff --git a/.gitignore b/.gitignore
index 538c8c5..495004e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 *~
+.idea
diff --git a/README.md b/README.md
index 1fe724e..2c9c52b 100644
--- a/README.md
+++ b/README.md
@@ -6,66 +6,91 @@ Apache SkyWalking Kubernetes
 [![GitHub 
stars](https://img.shields.io/github/stars/apache/skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/skywalking)
 [![Twitter 
Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
-SkyWalking Kubernetes repository provides ways to install and configure 
skywalking in a Kubernetes cluster.
-The scripts are written in Helm3.
+SkyWalking Kubernetes repository provides ways to install and configure 
SkyWalking in a Kubernetes cluster.
+The scripts are written in Helm 3.
 
 ## Documentation
 
- Chart Detailed Configuration
-chart detailed configuration please read [Chart 
Readme](./chart/skywalking/README.md)
+### Chart Detailed Configuration
+Chart detailed configuration can be found at [Chart 
Readme](./chart/skywalking/README.md)
 
- Deploy SkyWalking and Elasticsearch 7 (default)
+### Deploy SkyWalking in a Kubernetes cluster
 
-```shell script
-$ cd chart
+ Prerequisites
 
-$ helm repo add elastic https://helm.elastic.co
+```shell script
+git clone https://github.com/apache/skywalking-kubernetes
+cd skywalking-kubernetes/chart
+helm repo add elastic https://helm.elastic.co
+helm dep up skywalking
+export SKYWALKING_RELEASE_NAME=skywalking  # change the release name according 
to your scenario
+export SKYWALKING_RELEASE_NAMESPACE=istio-system  # change the namespace 
according to your scenario
+```
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & Elasticsearch 6 (default)
 
-$ helm install  skywalking -n 
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}"
 ``` 
 
-**Note**: If you want to deploy Elasticsearch 6, execute the following command
+ Deploy the latest SkyWalking & Elasticsearch 7
 
 ```shell script
-$ helm dep up skywalking
-
-$ helm install  skywalking -n  --values 
./skywalking/values-es6.yaml
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-es7.yaml
 ```
 
- Only deploy SkyWalking ,and use existing Elasticsearch
-If not want to deploy a new elasticsearch cluster, this way can be solved.
+ Deploy a specific version of SkyWalking & Elasticsearch
+
+- Deploy SkyWalking 8.0.1 & Elasticsearch 6.8.6
 
-Only need to close the elasticsearch deployed by chart default and configure 
the existing elasticsearch connection method.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.0.1-es6 \
+  --set ui.image.tag=8.0.1 \
+  --set elasticsearch.imageTag=6.8.6
+```
 
+- Deploy SkyWalking 8.1.0 & Elasticsearch 7.5.1
 ```shell script
-$ cd chart
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.1.0-es7 \
+  --set ui.image.tag=8.1.0 \
+  --set elasticsearch.imageTag=7.5.1
+``` 
 
-$ helm repo add elastic https://helm.elastic.co
+**NOTE**: Please make sure the specified OAP image tag supports the specified 
Elasticsearch version. 
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & an existing Elasticsearch
 
-$ helm install  skywalking -n  \
---set elasticsearch.enabled=false \
---set elasticsearch.config.host= \
---set elasticsearch.config.port.http= \
---set elasticsearch.config.user= \
---set elasticsearch.config.password= 
+1. Modify the connection information to the existing elasticsearch cluster in 
file [`values-my-es.yaml`](chart/skywalking/values-my-es.yaml).
+1. Execute the command.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-my-es.yaml
+```
+
+OR, if your existing Elasticsearch version is 7.x.x
+
+```she

[skywalking-kubernetes] 01/01: Refactor to unify the versions of SkyWalking

2020-10-16 Thread kezhenxu94
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git

commit 8775729951d885b09bcdd66720c38b2449f1aa2f
Author: kezhenxu94 
AuthorDate: Sat Oct 17 00:20:04 2020 +0800

Refactor to unify the versions of SkyWalking
---
 .gitignore |   1 +
 README.md  |  97 ++
 chart/skywalking/README.md |  12 +-
 chart/skywalking/values-es6.yaml   | 356 -
 chart/skywalking/values-es7.yaml   |  26 +++
 chart/skywalking/values-my-es.yaml |  27 +++
 chart/skywalking/values.yaml   |   8 +-
 7 files changed, 125 insertions(+), 402 deletions(-)

diff --git a/.gitignore b/.gitignore
index 538c8c5..495004e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 *~
+.idea
diff --git a/README.md b/README.md
index 1fe724e..2c9c52b 100644
--- a/README.md
+++ b/README.md
@@ -6,66 +6,91 @@ Apache SkyWalking Kubernetes
 [![GitHub 
stars](https://img.shields.io/github/stars/apache/skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/skywalking)
 [![Twitter 
Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
-SkyWalking Kubernetes repository provides ways to install and configure 
skywalking in a Kubernetes cluster.
-The scripts are written in Helm3.
+SkyWalking Kubernetes repository provides ways to install and configure 
SkyWalking in a Kubernetes cluster.
+The scripts are written in Helm 3.
 
 ## Documentation
 
- Chart Detailed Configuration
-chart detailed configuration please read [Chart 
Readme](./chart/skywalking/README.md)
+### Chart Detailed Configuration
+Chart detailed configuration can be found at [Chart 
Readme](./chart/skywalking/README.md)
 
- Deploy SkyWalking and Elasticsearch 7 (default)
+### Deploy SkyWalking in a Kubernetes cluster
 
-```shell script
-$ cd chart
+ Prerequisites
 
-$ helm repo add elastic https://helm.elastic.co
+```shell script
+git clone https://github.com/apache/skywalking-kubernetes
+cd skywalking-kubernetes/chart
+helm repo add elastic https://helm.elastic.co
+helm dep up skywalking
+export SKYWALKING_RELEASE_NAME=skywalking  # change the release name according 
to your scenario
+export SKYWALKING_RELEASE_NAMESPACE=istio-system  # change the namespace 
according to your scenario
+```
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & Elasticsearch 6 (default)
 
-$ helm install  skywalking -n 
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}"
 ``` 
 
-**Note**: If you want to deploy Elasticsearch 6, execute the following command
+ Deploy the latest SkyWalking & Elasticsearch 7
 
 ```shell script
-$ helm dep up skywalking
-
-$ helm install  skywalking -n  --values 
./skywalking/values-es6.yaml
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-es7.yaml
 ```
 
- Only deploy SkyWalking ,and use existing Elasticsearch
-If not want to deploy a new elasticsearch cluster, this way can be solved.
+ Deploy a specific version of SkyWalking & Elasticsearch
+
+- Deploy SkyWalking 8.0.1 & Elasticsearch 6.8.6
 
-Only need to close the elasticsearch deployed by chart default and configure 
the existing elasticsearch connection method.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.0.1-es6 \
+  --set ui.image.tag=8.0.1 \
+  --set elasticsearch.imageTag=6.8.6
+```
 
+- Deploy SkyWalking 8.1.0 & Elasticsearch 7.5.1
 ```shell script
-$ cd chart
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.1.0-es7 \
+  --set ui.image.tag=8.1.0 \
+  --set elasticsearch.imageTag=7.5.1
+``` 
 
-$ helm repo add elastic https://helm.elastic.co
+**NOTE**: Please make sure the specified OAP image tag supports the specified 
Elasticsearch version. 
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & an existing Elasticsearch
 
-$ helm install  skywalking -n  \
---set elasticsearch.enabled=false \
---set elasticsearch.config.host= \
---set elasticsearch.config.port.http= \
---set elasticsearch.config.user= \
---set elasticsearch.config.password= 
+1. Modify the connection information to the existing elasticsearch cluster in 
file [`values-my-es.yaml`](chart/skywalking/values-my-es.yaml).
+1. Execute the command.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-my-es.yaml
+```
+
+OR, if your existing Elasticsearch version is 7.x.x
+
+```she

[skywalking-kubernetes] 01/01: Refactor to unify the versions of SkyWalking

2020-10-16 Thread kezhenxu94
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git

commit e2a1deb09d528ea229a3fc5b4dbaba757f0a1eaa
Author: kezhenxu94 
AuthorDate: Sat Oct 17 00:20:04 2020 +0800

Refactor to unify the versions of SkyWalking
---
 .gitignore |   1 +
 README.md  |  97 ++
 chart/skywalking/README.md |  12 +-
 chart/skywalking/values-es6.yaml   | 356 -
 chart/skywalking/values-es7.yaml   |  26 +++
 chart/skywalking/values-my-es.yaml |  27 +++
 chart/skywalking/values.yaml   |   8 +-
 7 files changed, 125 insertions(+), 402 deletions(-)

diff --git a/.gitignore b/.gitignore
index 538c8c5..495004e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 *~
+.idea
diff --git a/README.md b/README.md
index 1fe724e..e15a680 100644
--- a/README.md
+++ b/README.md
@@ -6,66 +6,91 @@ Apache SkyWalking Kubernetes
 [![GitHub 
stars](https://img.shields.io/github/stars/apache/skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/skywalking)
 [![Twitter 
Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
-SkyWalking Kubernetes repository provides ways to install and configure 
skywalking in a Kubernetes cluster.
-The scripts are written in Helm3.
+SkyWalking Kubernetes repository provides ways to install and configure 
SkyWalking in a Kubernetes cluster.
+The scripts are written in Helm 3.
 
 ## Documentation
 
- Chart Detailed Configuration
-chart detailed configuration please read [Chart 
Readme](./chart/skywalking/README.md)
+### Chart Detailed Configuration
+Chart detailed configuration can be found at [Chart 
Readme](./chart/skywalking/README.md)
 
- Deploy SkyWalking and Elasticsearch 7 (default)
+### Deploy SkyWalking in a Kubernetes cluster
 
-```shell script
-$ cd chart
+ Prerequisites
 
-$ helm repo add elastic https://helm.elastic.co
+```shell script
+git clone https://github.com/apache/skywalking-kubernetes
+cd skywalking-kubernetes/chart
+helm repo add elastic https://helm.elastic.co
+helm dep up skywalking
+export SKYWALKING_RELEASE_NAME=skywalking  # change the release name according 
to your scenario
+export SKYWALKING_RELEASE_NAMESPACE=istio-system  # change the namespace 
according to your scenario
+```
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & Elasticsearch 6 (default)
 
-$ helm install  skywalking -n 
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}"
 ``` 
 
-**Note**: If you want to deploy Elasticsearch 6, execute the following command
+ Deploy the latest SkyWalking & Elasticsearch 7
 
 ```shell script
-$ helm dep up skywalking
-
-$ helm install  skywalking -n  --values 
./skywalking/values-es6.yaml
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-es7.yaml
 ```
 
- Only deploy SkyWalking ,and use existing Elasticsearch
-If not want to deploy a new elasticsearch cluster, this way can be solved.
+ Deploy a specific version of SkyWalking & Elasticsearch
+
+- Deploy SkyWalking 8.0.1 & Elasticsearch 6.8.6
 
-Only need to close the elasticsearch deployed by chart default and configure 
the existing elasticsearch connection method.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.0.1-es6 \
+  --set ui.image.tag=8.0.1 \
+  --set elasticsearch.imageTag=6.8.6
+```
 
+- Deploy SkyWalking 8.1.0 & Elasticsearch 7.5.1
 ```shell script
-$ cd chart
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  --set oap.image.tag=8.1.0-es7 \
+  --set ui.image.tag=8.1.0 \
+  --set elasticsearch.imageTag=7.5.1
+``` 
 
-$ helm repo add elastic https://helm.elastic.co
+**NOTE**: Please make sure the specified OAP image version supports the 
specified Elasticsearch version. 
 
-$ helm dep up skywalking
+ Deploy the latest SkyWalking & an existing Elasticsearch
 
-$ helm install  skywalking -n  \
---set elasticsearch.enabled=false \
---set elasticsearch.config.host= \
---set elasticsearch.config.port.http= \
---set elasticsearch.config.user= \
---set elasticsearch.config.password= 
+1. Modify the connection information to the existing elasticsearch cluster in 
file [`values-my-es.yaml`](chart/skywalking/values-my-es.yaml).
+1. Execute the command.
+```shell script
+helm install "${SKYWALKING_RELEASE_NAME}" skywalking -n 
"${SKYWALKING_RELEASE_NAMESPACE}" \
+  -f ./skywalking/values.yaml \
+  -f ./skywalking/values-my-es.yaml
+```
+
+OR, if your existing Elasticsearch version is 7.x.x
+
+``