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 a97e23b Add "pods/log" to OAP so on-demand Pod log can work (#87)
a97e23b is described below
commit a97e23b10dfd63d4bb184e0c9901f5bc3acb057d
Author: kezhenxu94 <[email protected]>
AuthorDate: Thu Jun 30 15:37:18 2022 +0800
Add "pods/log" to OAP so on-demand Pod log can work (#87)
---
README.md | 28 ++++++++++++-------------
chart/skywalking/templates/oap-clusterrole.yaml | 2 +-
chart/skywalking/values-es6.yaml | 4 ++--
chart/skywalking/values-es7.yaml | 4 ++--
chart/skywalking/values-my-es.yaml | 4 ++--
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
index e61dfdf..c7042e2 100644
--- a/README.md
+++ b/README.md
@@ -17,11 +17,11 @@ There are required values that you must set explicitly when
deploying SkyWalking
| name | description | example |
| ---- | ----------- | ------- |
-| `oap.image.tag` | the OAP docker image tag | `8.8.1` |
+| `oap.image.tag` | the OAP docker image tag | `9.1.0` |
| `oap.storageType` | the storage type of the OAP | `elasticsearch`,
`postgresql`, etc. |
-| `ui.image.tag` | the UI docker image tag | `8.8.1` |
+| `ui.image.tag` | the UI docker image tag | `9.1.0` |
-You can set these required values via command line (e.g. `--set
oap.image.tag=8.8.1 --set oap.storageType=elasticsearch`),
+You can set these required values via command line (e.g. `--set
oap.image.tag=9.1.0 --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.
@@ -38,11 +38,11 @@ export SKYWALKING_RELEASE_NAMESPACE=default # change the
namespace to where you
```shell
export REPO=skywalking
-helm repo add ${REPO} https://apache.jfrog.io/artifactory/skywalking-helm
+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.8.1 \
+ --set oap.image.tag=9.1.0 \
--set oap.storageType=elasticsearch \
- --set ui.image.tag=8.8.1 \
+ --set ui.image.tag=9.1.0 \
--set elasticsearch.imageTag=6.8.6
```
@@ -65,26 +65,26 @@ In theory, you can deploy all versions of SkyWalking that
are >= 6.0.0-GA, by sp
Please note that some configurations that are added in the later versions of
SkyWalking may not work in earlier versions, and thus if you
specify those configurations, they may take no effect.
-here are some examples.
+here are some examples.
-- Deploy SkyWalking 8.8.1 & Elasticsearch 6.8.6
+- Deploy SkyWalking 9.1.0 & Elasticsearch 6.8.6
```shell script
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n
"${SKYWALKING_RELEASE_NAMESPACE}" \
- --set oap.image.tag=8.8.1 \
+ --set oap.image.tag=9.1.0 \
--set oap.storageType=elasticsearch \
- --set ui.image.tag=8.8.1 \
+ --set ui.image.tag=9.1.0 \
--set elasticsearch.imageTag=6.8.6
```
-- Deploy SkyWalking 8.8.1 & Elasticsearch 7.5.1
+- Deploy SkyWalking 9.1.0 & Elasticsearch 7.5.1
```shell script
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n
"${SKYWALKING_RELEASE_NAMESPACE}" \
- --set oap.image.tag=8.8.1 \
+ --set oap.image.tag=9.1.0 \
--set oap.storageType=elasticsearch \
- --set ui.image.tag=8.8.1 \
+ --set ui.image.tag=9.1.0 \
--set elasticsearch.imageTag=7.5.1
-```
+```
- Deploy SkyWalking 6.6.0 with Elasticsearch 7
diff --git a/chart/skywalking/templates/oap-clusterrole.yaml
b/chart/skywalking/templates/oap-clusterrole.yaml
index 4adfc19..d847f25 100644
--- a/chart/skywalking/templates/oap-clusterrole.yaml
+++ b/chart/skywalking/templates/oap-clusterrole.yaml
@@ -25,7 +25,7 @@ metadata:
heritage: "{{ .Release.Service }}"
rules:
- apiGroups: [""]
- resources: ["pods", "endpoints", "services", "nodes"]
+ resources: ["pods", "pods/log", "endpoints", "services", "nodes"]
verbs: ["get", "watch", "list"]
- apiGroups: ["extensions"]
resources: ["deployments", "replicasets"]
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index 00acecb..b9894d0 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/chart/skywalking/values-es6.yaml
@@ -19,12 +19,12 @@
oap:
image:
- tag: 8.8.1
+ tag: 9.1.0
storageType: elasticsearch
ui:
image:
- tag: 8.8.1
+ tag: 9.1.0
elasticsearch:
imageTag: "6.8.6"
diff --git a/chart/skywalking/values-es7.yaml b/chart/skywalking/values-es7.yaml
index 169e4c2..99c552f 100644
--- a/chart/skywalking/values-es7.yaml
+++ b/chart/skywalking/values-es7.yaml
@@ -19,12 +19,12 @@
oap:
image:
- tag: 8.8.1
+ tag: 9.1.0
storageType: elasticsearch
ui:
image:
- tag: 8.8.1
+ tag: 9.1.0
elasticsearch:
imageTag: "7.5.1"
diff --git a/chart/skywalking/values-my-es.yaml
b/chart/skywalking/values-my-es.yaml
index 326b4d6..22f07ae 100644
--- a/chart/skywalking/values-my-es.yaml
+++ b/chart/skywalking/values-my-es.yaml
@@ -19,12 +19,12 @@
oap:
image:
- tag: 8.8.1
+ tag: 9.1.0
storageType: elasticsearch
ui:
image:
- tag: 8.8.1
+ tag: 9.1.0
elasticsearch:
enabled: false
