You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/10/09 14:09:51 UTC
[skywalking-kubernetes] branch master updated: Update doc as per
the unified Docker images for ES clients (#81)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new cc69320 Update doc as per the unified Docker images for ES clients (#81)
cc69320 is described below
commit cc693201ec0cd8f0439cc923844d3716602c93dc
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sat Oct 9 22:09:45 2021 +0800
Update doc as per the unified Docker images for ES clients (#81)
---
.github/workflows/e2e.ci.yaml | 6 +++---
.github/workflows/e2e.compatibility.yaml | 4 ++--
README.md | 33 ++++++++++++++++----------------
chart/skywalking/values-es6.yaml | 4 ++--
chart/skywalking/values-es7.yaml | 6 +++---
chart/skywalking/values-my-es.yaml | 6 +++---
6 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index 3741af4..60a023e 100644
--- a/.github/workflows/e2e.ci.yaml
+++ b/.github/workflows/e2e.ci.yaml
@@ -19,7 +19,7 @@ name: Test
on:
pull_request:
push:
- path:
+ paths:
- '!**.md'
branches:
- master
@@ -33,7 +33,7 @@ env:
jobs:
als:
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-latest
timeout-minutes: 60
name: Istio+Envoy Access Log Service
steps:
@@ -137,7 +137,7 @@ jobs:
run: minikube delete
build:
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-latest
needs: [als]
steps:
- name: dummy
diff --git a/.github/workflows/e2e.compatibility.yaml b/.github/workflows/e2e.compatibility.yaml
index af6e03c..dbef919 100644
--- a/.github/workflows/e2e.compatibility.yaml
+++ b/.github/workflows/e2e.compatibility.yaml
@@ -18,7 +18,7 @@ name: Test Compatibility
on:
pull_request:
- path:
+ paths:
- '!**.md'
env:
@@ -28,7 +28,7 @@ env:
jobs:
als:
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
diff --git a/README.md b/README.md
index d17f32a..b1468c0 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,12 @@ There are required values that you must set explicitly when deploying SkyWalking
| name | description | example |
| ---- | ----------- | ------- |
-| `oap.image.tag` | the OAP docker image tag | `8.1.0-es6`, `8.1.0-es7`, etc. |
-| `oap.storageType` | the storage type of the OAP | `elasticsearch`, `elasticsearch7`, etc. |
-| `ui.image.tag` | the UI docker image tag | `8.0.1`, `8.1.0`, ect. |
+| `oap.image.tag` | the OAP docker image tag | `8.8.1` |
+| `oap.storageType` | the storage type of the OAP | `elasticsearch`, `postgresql`, etc. |
+| `ui.image.tag` | the UI docker image tag | `8.8.1` |
-You can set these required values via command line (e.g. `--set oap.image.tag=8.1.0-es6 --set oap.storageType=elasticsearch`),
-or edit them in a separate file(e.g. [`values-es6.yaml`](chart/skywalking/values-es6.yaml), [`values-es7.yaml`](chart/skywalking/values-es7.yaml))
+You can set these required values via command line (e.g. `--set oap.image.tag=8.8.1 --set oap.storageType=elasticsearch`),
+or edit them in a separate file(e.g. [`values.yaml`](chart/skywalking/values-es6.yaml), [`values-es7.yaml`](chart/skywalking/values-es7.yaml))
and use `-f <filename>` or `--values=<filename>` to set them.
# Install
@@ -40,9 +40,9 @@ export SKYWALKING_RELEASE_NAMESPACE=default # change the namespace to where you
export REPO=skywalking
helm repo add ${REPO} https://apache.jfrog.io/artifactory/skywalking-helm
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n "${SKYWALKING_RELEASE_NAMESPACE}" \
- --set oap.image.tag=8.0.1-es6 \
+ --set oap.image.tag=8.8.1 \
--set oap.storageType=elasticsearch \
- --set ui.image.tag=8.0.1 \
+ --set ui.image.tag=8.8.1 \
--set elasticsearch.imageTag=6.8.6
```
@@ -67,27 +67,30 @@ specify those configurations, they may take no effect.
here are some examples.
-- Deploy SkyWalking 8.0.1 & Elasticsearch 6.8.6
+- Deploy SkyWalking 8.8.1 & Elasticsearch 6.8.6
```shell script
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n "${SKYWALKING_RELEASE_NAMESPACE}" \
- --set oap.image.tag=8.0.1-es6 \
+ --set oap.image.tag=8.8.1 \
--set oap.storageType=elasticsearch \
- --set ui.image.tag=8.0.1 \
+ --set ui.image.tag=8.8.1 \
--set elasticsearch.imageTag=6.8.6
```
-- Deploy SkyWalking 8.1.0 & Elasticsearch 7.5.1
+- Deploy SkyWalking 8.8.1 & Elasticsearch 7.5.1
```shell script
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n "${SKYWALKING_RELEASE_NAMESPACE}" \
- --set oap.image.tag=8.1.0-es7 \
- --set oap.storageType=elasticsearch7 \
- --set ui.image.tag=8.1.0 \
+ --set oap.image.tag=8.8.1 \
+ --set oap.storageType=elasticsearch \
+ --set ui.image.tag=8.8.1 \
--set elasticsearch.imageTag=7.5.1
```
- Deploy SkyWalking 6.6.0 with Elasticsearch 7
+**Note**: because SkyWalking OAP used 2 different Docker images for ElasticSearch 7 and ElasticSearch 6 in versions
+prior to 8.8.0, you have to set the right image tag for the corresponding ElasticSearch version.
+
```shell script
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n "${SKYWALKING_RELEASE_NAMESPACE}" \
--set oap.image.tag=6.6.0-es7 \
@@ -104,8 +107,6 @@ helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n "${SKYWALKING_RE
--set ui.image.tag=6.5.0
```
-**NOTE**: Please make sure the specified OAP image tag supports the specified Elasticsearch version.
-
## Install a specific version of SkyWalking with an existing Elasticsearch
Modify the connection information to the existing elasticsearch cluster in file [`values-my-es.yaml`](chart/skywalking/values-my-es.yaml).
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index 4522cf3..00acecb 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/chart/skywalking/values-es6.yaml
@@ -19,12 +19,12 @@
oap:
image:
- tag: 8.1.0-es6
+ tag: 8.8.1
storageType: elasticsearch
ui:
image:
- tag: 8.1.0
+ tag: 8.8.1
elasticsearch:
imageTag: "6.8.6"
diff --git a/chart/skywalking/values-es7.yaml b/chart/skywalking/values-es7.yaml
index 63302b4..169e4c2 100644
--- a/chart/skywalking/values-es7.yaml
+++ b/chart/skywalking/values-es7.yaml
@@ -19,12 +19,12 @@
oap:
image:
- tag: 8.1.0-es7
- storageType: elasticsearch7
+ tag: 8.8.1
+ storageType: elasticsearch
ui:
image:
- tag: 8.1.0
+ tag: 8.8.1
elasticsearch:
imageTag: "7.5.1"
diff --git a/chart/skywalking/values-my-es.yaml b/chart/skywalking/values-my-es.yaml
index 4adaec8..326b4d6 100644
--- a/chart/skywalking/values-my-es.yaml
+++ b/chart/skywalking/values-my-es.yaml
@@ -19,12 +19,12 @@
oap:
image:
- tag: 8.1.0-es7 # Set the right tag according to the existing Elasticsearch version
- storageType: elasticsearch7
+ tag: 8.8.1
+ storageType: elasticsearch
ui:
image:
- tag: 8.1.0
+ tag: 8.8.1
elasticsearch:
enabled: false