You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2022/09/17 01:58:52 UTC
[skywalking-kubernetes] 01/01: Remove Istio adapter, add changelog for 4.3.0
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch rel/4.3.0
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
commit a90ffc7fde1c44279b850260b7ce532600dabe94
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sat Sep 17 09:58:39 2022 +0800
Remove Istio adapter, add changelog for 4.3.0
---
.gitignore | 3 +-
CHANGES.md | 11 ++++--
README.md | 22 ++++++------
.../templates/istio-adapter/adapter.yaml | 27 --------------
.../templates/istio-adapter/handler.yaml | 26 --------------
.../templates/istio-adapter/instance.yaml | 42 ----------------------
chart/skywalking/templates/istio-adapter/rule.yaml | 28 ---------------
chart/skywalking/values-es6.yaml | 4 +--
chart/skywalking/values-es7.yaml | 4 +--
chart/skywalking/values-my-es.yaml | 6 ++--
chart/skywalking/values.yaml | 3 --
11 files changed, 29 insertions(+), 147 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2120144..79a111b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.DS_Store
*~
.idea
-.vscode
\ No newline at end of file
+.vscode
+chart/skywalking/charts/
diff --git a/CHANGES.md b/CHANGES.md
index e88666e..088fcb1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -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
------------------
@@ -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
@@ -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
diff --git a/README.md b/README.md
index d229c39..756a680 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 | `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.
@@ -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
```
@@ -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
```
diff --git a/chart/skywalking/templates/istio-adapter/adapter.yaml b/chart/skywalking/templates/istio-adapter/adapter.yaml
deleted file mode 100644
index 4b6e5cb..0000000
--- a/chart/skywalking/templates/istio-adapter/adapter.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.oap.istio.adapter.enabled }}
-apiVersion: "config.istio.io/v1alpha2"
-kind: adapter
-metadata:
- name: skywalking-adapter
-spec:
- description: "skywaling-adapter"
- session_based: false
- templates:
- - metric
-{{- end}}
diff --git a/chart/skywalking/templates/istio-adapter/handler.yaml b/chart/skywalking/templates/istio-adapter/handler.yaml
deleted file mode 100644
index 85368ca..0000000
--- a/chart/skywalking/templates/istio-adapter/handler.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.oap.istio.adapter.enabled }}
-apiVersion: "config.istio.io/v1alpha2"
-kind: handler
-metadata:
- name: skywalking-handler
-spec:
- adapter: skywalking-adapter
- connection:
- address: {{ template "skywalking.oap.fullname" . }}"."{{ .Release.Namespace }}".svc.cluster.local:{{ .Values.oap.ports.grpc }}"
-{{- end }}
\ No newline at end of file
diff --git a/chart/skywalking/templates/istio-adapter/instance.yaml b/chart/skywalking/templates/istio-adapter/instance.yaml
deleted file mode 100644
index 11a5f8c..0000000
--- a/chart/skywalking/templates/istio-adapter/instance.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# instance for template metric
-{{- if .Values.oap.istio.adapter.enabled }}
-apiVersion: "config.istio.io/v1alpha2"
-kind: instance
-metadata:
- name: skywalking-metric
-spec:
- template: metric
- params:
- value: request.size | 0
- dimensions:
- sourceService: source.workload.name | ""
- sourceNamespace: source.workload.namespace | ""
- sourceUID: source.uid | ""
- destinationService: destination.workload.name | ""
- destinationNamespace: destination.workload.namespace | ""
- destinationUID: destination.uid | ""
- requestMethod: request.method | ""
- requestPath: request.path | ""
- requestScheme: request.scheme | ""
- requestTime: request.time
- responseTime: response.time
- responseCode: response.code | 200
- reporter: conditional((context.reporter.kind | "inbound") == "outbound", "source", "destination")
- apiProtocol: api.protocol | ""
-{{- end }}
\ No newline at end of file
diff --git a/chart/skywalking/templates/istio-adapter/rule.yaml b/chart/skywalking/templates/istio-adapter/rule.yaml
deleted file mode 100644
index 98f2868..0000000
--- a/chart/skywalking/templates/istio-adapter/rule.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# rule to dispatch to handler sw
-{{- if .Values.oap.istio.adapter.enabled }}
-apiVersion: "config.istio.io/v1alpha2"
-kind: rule
-metadata:
- name: skywalking-metric-rule
-spec:
- actions:
- - handler: skywalking-handler.istio-system
- instances:
- - skywalking-metric
-{{- end }}
\ No newline at end of file
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index b9894d0..da3f71c 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/chart/skywalking/values-es6.yaml
@@ -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"
diff --git a/chart/skywalking/values-es7.yaml b/chart/skywalking/values-es7.yaml
index 99c552f..ba315a0 100644
--- a/chart/skywalking/values-es7.yaml
+++ b/chart/skywalking/values-es7.yaml
@@ -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"
diff --git a/chart/skywalking/values-my-es.yaml b/chart/skywalking/values-my-es.yaml
index 22f07ae..43f4989 100644
--- a/chart/skywalking/values-my-es.yaml
+++ b/chart/skywalking/values-my-es.yaml
@@ -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]
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 4b9185d..ade4916 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -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