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/08/07 00:07:41 UTC
[skywalking-kubernetes] branch master updated: 3.1.0 (#51)
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 558f46c 3.1.0 (#51)
558f46c is described below
commit 558f46c9758b588f520754046a5c5d6b6a7562cf
Author: innerpeacez <in...@gmail.com>
AuthorDate: Fri Aug 7 08:07:33 2020 +0800
3.1.0 (#51)
---
README.md | 1 +
chart/skywalking/Chart.yaml | 4 ++--
chart/skywalking/README.md | 1 +
.../templates/{oap-role.yaml => oap-configmap.yaml} | 18 +++++++-----------
chart/skywalking/templates/oap-deployment.yaml | 6 ++++++
chart/skywalking/templates/oap-role.yaml | 2 +-
chart/skywalking/values-es6.yaml | 8 ++++++--
chart/skywalking/values.yaml | 8 ++++++--
8 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index 2d1ea24..1fe724e 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ This is recommended as the best practice to deploy SkyWalking backend stack into
| 6.6.0 | 1.1.0 |
| 7.0.0 | 2.0.0 |
| 8.0.1 | 3.0.0 |
+| 8.1.0 | 3.1.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 f084c40..98cfa09 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: 3.0.0
-appVersion: 8.0.1
+version: 3.1.0
+appVersion: 8.1.0
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/README.md b/chart/skywalking/README.md
index b1c380c..d1ef3a9 100644
--- a/chart/skywalking/README.md
+++ b/chart/skywalking/README.md
@@ -43,6 +43,7 @@ The following table lists the configurable parameters of the Skywalking chart an
| `nameOverride` | Override name | `nil` |
| `serviceAccounts.oap` | Name of the OAP service account to use or create | `nil` |
| `oap.name` | OAP deployment name | `oap` |
+| `oap.dymicConfigEnabled` | Enable oap dynamic configuration through k8s configmap | `false` |
| `oap.image.repository` | OAP container image name | `apache/skywalking-oap-server` |
| `oap.image.tag` | OAP container image tag | `6.1.0` |
| `oap.image.pullPolicy` | OAP container image pull policy | `IfNotPresent` |
diff --git a/chart/skywalking/templates/oap-role.yaml b/chart/skywalking/templates/oap-configmap.yaml
similarity index 69%
copy from chart/skywalking/templates/oap-role.yaml
copy to chart/skywalking/templates/oap-configmap.yaml
index 2d96463..50efca4 100644
--- a/chart/skywalking/templates/oap-role.yaml
+++ b/chart/skywalking/templates/oap-configmap.yaml
@@ -13,18 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- if not .Values.oap.envoy.als.enabled }}
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
+{{- if .Values.oap.dymicConfigEnabled }}
+apiVersion: v1
+kind: ConfigMap
metadata:
- name: {{ template "skywalking.fullname" . }}
+ name: skywalking-dynamic-config
labels:
app: {{ template "skywalking.name" . }}
- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
-rules:
- - apiGroups: [""]
- resources: ["pods"]
- verbs: ["get", "watch", "list"]
+ release: {{ .Release.Name }}
+ component: {{ .Values.oap.name }}
+data:
{{- end }}
\ No newline at end of file
diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
index 9d6c956..47917ec 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/chart/skywalking/templates/oap-deployment.yaml
@@ -108,6 +108,12 @@ spec:
value: kubernetes
- name: SW_CLUSTER_K8S_NAMESPACE
value: "{{ .Release.Namespace }}"
+{{- if .Values.oap.dymicConfigEnabled }}
+ - name: SW_CONFIGURATION
+ value: k8s-configmap
+ - name: SW_CONFIG_CONFIGMAP_PERIOD
+ value: "60"
+{{- end }}
- name: SW_CLUSTER_K8S_LABEL
value: "app={{ template "skywalking.name" . }},release={{ .Release.Name }},component={{ .Values.oap.name }}"
- name: SKYWALKING_COLLECTOR_UID
diff --git a/chart/skywalking/templates/oap-role.yaml b/chart/skywalking/templates/oap-role.yaml
index 2d96463..f51c2f9 100644
--- a/chart/skywalking/templates/oap-role.yaml
+++ b/chart/skywalking/templates/oap-role.yaml
@@ -25,6 +25,6 @@ metadata:
heritage: "{{ .Release.Service }}"
rules:
- apiGroups: [""]
- resources: ["pods"]
+ resources: ["pods","configmaps"]
verbs: ["get", "watch", "list"]
{{- end }}
\ No newline at end of file
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index 58a7d24..ce59fb8 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/chart/skywalking/values-es6.yaml
@@ -22,9 +22,13 @@ serviceAccounts:
oap:
name: oap
+ # When 'dymicConfigEnabled' set to true, enable oap dynamic configuration through k8s configmap，
+ # Note: The default configmap data is empty, please refer to the detailed documentation (https://github.com/apache/skywalking/blob/master/docs/en/setup/backend/dynamic-config.md)
+ # Sync period in seconds. Defaults to 60 seconds. env: SW_CONFIG_CONFIGMAP_PERIOD
+ dymicConfigEnabled: false
image:
repository: apache/skywalking-oap-server
- tag: 8.0.1-es6
+ tag: 8.1.0-es6
pullPolicy: IfNotPresent
storageType: elasticsearch
ports:
@@ -62,7 +66,7 @@ ui:
replicas: 1
image:
repository: apache/skywalking-ui
- tag: 8.0.1
+ tag: 8.1.0
pullPolicy: IfNotPresent
# podAnnotations:
# example: oap-foo
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 203b218..7d56436 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -22,9 +22,13 @@ serviceAccounts:
oap:
name: oap
+ # When 'dymicConfigEnabled' set to true, enable oap dynamic configuration through k8s configmap，
+ # Note: The default configmap data is empty, please refer to the detailed documentation (https://github.com/apache/skywalking/blob/master/docs/en/setup/backend/dynamic-config.md)
+ # Sync period in seconds. Defaults to 60 seconds. env: SW_CONFIG_CONFIGMAP_PERIOD
+ dymicConfigEnabled: false
image:
repository: apache/skywalking-oap-server
- tag: 8.0.1-es7
+ tag: 8.1.0-es7
pullPolicy: IfNotPresent
storageType: elasticsearch7
ports:
@@ -62,7 +66,7 @@ ui:
replicas: 1
image:
repository: apache/skywalking-ui
- tag: 8.0.1
+ tag: 8.1.0
pullPolicy: IfNotPresent
# podAnnotations:
# example: oap-foo