Skip to content

Commit

Permalink
Remove Istio adapter, add changelog for 4.3.0 (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
kezhenxu94 authored Sep 17, 2022
1 parent ab5567a commit a5a71ea
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 147 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.DS_Store
*~
.idea
.vscode
.vscode
chart/skywalking/charts/
11 changes: 9 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ Changes by Version
==================
Release Notes.

4.3.0
------------------

- Remove Istio adapter.
- Add `.Values.oap.initEs` to work with ElasticSearch init job.
- Add "pods/log" to OAP so on-demand Pod log can work.

4.2.0
------------------

Expand All @@ -27,7 +34,7 @@ Release Notes.

#### Features
- Allow overriding configurations files under /skywalking/config
- Unify the usages of different SkyWalking versions
- Unify the usages of different SkyWalking versions
- Add Values for init container in case of using private regestry
- Add `services`, `endpoints` resources in ClusterRole

Expand All @@ -47,7 +54,7 @@ Release Notes.
#### Features
- Support SkyWalking 8.0.1

##### Note:
##### Note:
- 8.0.0 image is not suitable as chart image, ISSUE: https://github.com/apache/skywalking/issues/4953

2.0.0
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `9.1.0` |
| `oap.image.tag` | the OAP docker image tag | `9.2.0` |
| `oap.storageType` | the storage type of the OAP | `elasticsearch`, `postgresql`, etc. |
| `oap.initEs` | need to initial ElasticSearch | `true`, `false` |
| `ui.image.tag` | the UI docker image tag | `9.1.0` |
| `ui.image.tag` | the UI docker image tag | `9.2.0` |

You can set these required values via command line (e.g. `--set oap.image.tag=9.1.0 --set oap.storageType=elasticsearch`),
You can set these required values via command line (e.g. `--set oap.image.tag=9.2.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.

Expand All @@ -41,9 +41,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=9.1.0 \
--set oap.image.tag=9.2.0 \
--set oap.storageType=elasticsearch \
--set ui.image.tag=9.1.0 \
--set ui.image.tag=9.2.0 \
--set elasticsearch.imageTag=6.8.6
```

Expand All @@ -68,22 +68,22 @@ specify those configurations, they may take no effect.

here are some examples.

- Deploy SkyWalking 9.1.0 & Elasticsearch 6.8.6
- Deploy SkyWalking 9.2.0 & Elasticsearch 6.8.6

```shell script
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n "${SKYWALKING_RELEASE_NAMESPACE}" \
--set oap.image.tag=9.1.0 \
--set oap.image.tag=9.2.0 \
--set oap.storageType=elasticsearch \
--set ui.image.tag=9.1.0 \
--set ui.image.tag=9.2.0 \
--set elasticsearch.imageTag=6.8.6
```

- Deploy SkyWalking 9.1.0 & Elasticsearch 7.5.1
- Deploy SkyWalking 9.2.0 & Elasticsearch 7.5.1
```shell script
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n "${SKYWALKING_RELEASE_NAMESPACE}" \
--set oap.image.tag=9.1.0 \
--set oap.image.tag=9.2.0 \
--set oap.storageType=elasticsearch \
--set ui.image.tag=9.1.0 \
--set ui.image.tag=9.2.0 \
--set elasticsearch.imageTag=7.5.1
```

Expand Down
27 changes: 0 additions & 27 deletions chart/skywalking/templates/istio-adapter/adapter.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions chart/skywalking/templates/istio-adapter/handler.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions chart/skywalking/templates/istio-adapter/instance.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions chart/skywalking/templates/istio-adapter/rule.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions chart/skywalking/values-es6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

oap:
image:
tag: 9.1.0
tag: 9.2.0
storageType: elasticsearch

ui:
image:
tag: 9.1.0
tag: 9.2.0

elasticsearch:
imageTag: "6.8.6"
4 changes: 2 additions & 2 deletions chart/skywalking/values-es7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

oap:
image:
tag: 9.1.0
tag: 9.2.0
storageType: elasticsearch

ui:
image:
tag: 9.1.0
tag: 9.2.0

elasticsearch:
imageTag: "7.5.1"
6 changes: 3 additions & 3 deletions chart/skywalking/values-my-es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@

oap:
image:
tag: 9.1.0
tag: 9.2.0
storageType: elasticsearch

ui:
image:
tag: 9.1.0
tag: 9.2.0

elasticsearch:
enabled: false
config: # For users of an existing elasticsearch cluster,takes effect when `elasticsearch.enabled` is false
host: your.elasticsearch.host.or.ip
host: elasticsearch-es-http
port:
http: 9200
user: "xxx" # [optional]
Expand Down
3 changes: 0 additions & 3 deletions chart/skywalking/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ oap:
als:
enabled: false
# more envoy ALS ,please refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/envoy/als_setting.md#observe-service-mesh-through-als
istio:
adapter:
enabled: false
env:
# more env, please refer to https://hub.docker.com/r/apache/skywalking-oap-server
# or https://github.com/apache/skywalking-docker/blob/master/6/6.4/oap/README.md#sw_telemetry
Expand Down

0 comments on commit a5a71ea

Please sign in to comment.