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 2020/06/22 08:49:08 UTC
[skywalking-kubernetes] branch master updated: update doc (#50)
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 25ca1ba update doc (#50)
25ca1ba is described below
commit 25ca1ba50c51609fadf1defbebd005a5da0c4429
Author: innerpeacez <in...@gmail.com>
AuthorDate: Mon Jun 22 16:49:00 2020 +0800
update doc (#50)
---
CHANGES.md | 9 +++++++++
README.md | 3 ++-
chart/skywalking/Chart.yaml | 4 ++--
chart/skywalking/templates/_helpers.tpl | 2 +-
chart/skywalking/templates/es-init.job.yaml | 2 +-
chart/skywalking/values-es6.yaml | 9 +++++----
chart/skywalking/values.yaml | 9 +++++----
7 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index b1db46c..13ee785 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,15 @@ Changes by Version
==================
Release Notes.
+3.0.0
+------------------
+
+#### Features
+- Support SkyWalking 8.0.1
+
+##### 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 a64a851..2d1ea24 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ $ helm install <release_name> skywalking -n <namespace> \
$ helm dep up skywalking
$ helm install <release_name> skywalking -n <namespace> \
- --values ./skywalking/values-es6.yaml
+ --values ./skywalking/values-es6.yaml \
--set elasticsearch.enabled=false \
--set elasticsearch.config.host=<es_host> \
--set elasticsearch.config.port.http=<es_port> \
@@ -80,6 +80,7 @@ This is recommended as the best practice to deploy SkyWalking backend stack into
| 6.5.0 | 1.0.0 |
| 6.6.0 | 1.1.0 |
| 7.0.0 | 2.0.0 |
+| 8.0.1 | 3.0.0 |
Please head to the [releases page](http://skywalking.apache.org/downloads/) to download a release of Apache SkyWalking.
diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
index 3efdefb..f084c40 100644
--- a/chart/skywalking/Chart.yaml
+++ b/chart/skywalking/Chart.yaml
@@ -16,8 +16,8 @@
apiVersion: v2
name: skywalking
home: https://skywalking.apache.org
-version: 2.0.0
-appVersion: 7.0.0
+version: 3.0.0
+appVersion: 8.0.1
description: Apache SkyWalking APM System
icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
diff --git a/chart/skywalking/templates/_helpers.tpl b/chart/skywalking/templates/_helpers.tpl
index d7009b4..0aef730 100644
--- a/chart/skywalking/templates/_helpers.tpl
+++ b/chart/skywalking/templates/_helpers.tpl
@@ -20,7 +20,7 @@ limitations under the License.
Expand the name of the chart.
*/}}
{{- define "skywalking.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- default .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
diff --git a/chart/skywalking/templates/es-init.job.yaml b/chart/skywalking/templates/es-init.job.yaml
index a2b626d..521ad21 100644
--- a/chart/skywalking/templates/es-init.job.yaml
+++ b/chart/skywalking/templates/es-init.job.yaml
@@ -52,7 +52,7 @@ spec:
- name: SW_STORAGE_ES_CLUSTER_NODES
{{- if .Values.elasticsearch.enabled }}
value: "{{ .Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"
- {{- else }}
+{{- else }}
value: "{{ .Values.elasticsearch.config.host }}:{{ .Values.elasticsearch.config.port.http }}"
{{- end }}
{{- if not .Values.elasticsearch.enabled }}
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index c6764d0..58a7d24 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/chart/skywalking/values-es6.yaml
@@ -21,10 +21,10 @@ serviceAccounts:
oap:
oap:
- name: skywalking-oap
+ name: oap
image:
repository: apache/skywalking-oap-server
- tag: 7.0.0-es6
+ tag: 8.0.1-es6
pullPolicy: IfNotPresent
storageType: elasticsearch
ports:
@@ -58,11 +58,11 @@ oap:
# 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
ui:
- name: skywalking-ui
+ name: ui
replicas: 1
image:
repository: apache/skywalking-ui
- tag: 7.0.0
+ tag: 8.0.1
pullPolicy: IfNotPresent
# podAnnotations:
# example: oap-foo
@@ -349,3 +349,4 @@ elasticsearch:
keystore: []
nameOverride: ""
+fullnameOverride: ""
\ No newline at end of file
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 0170caf..203b218 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -21,10 +21,10 @@ serviceAccounts:
oap:
oap:
- name: skywalking-oap
+ name: oap
image:
repository: apache/skywalking-oap-server
- tag: 7.0.0-es7
+ tag: 8.0.1-es7
pullPolicy: IfNotPresent
storageType: elasticsearch7
ports:
@@ -58,11 +58,11 @@ oap:
# 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
ui:
- name: skywalking-ui
+ name: ui
replicas: 1
image:
repository: apache/skywalking-ui
- tag: 7.0.0
+ tag: 8.0.1
pullPolicy: IfNotPresent
# podAnnotations:
# example: oap-foo
@@ -349,3 +349,4 @@ elasticsearch:
keystore: []
nameOverride: ""
+fullnameOverride: ""
\ No newline at end of file