From d383403a58fefa901b03bcdb925db402a17e8718 Mon Sep 17 00:00:00 2001 From: innerpeacez Date: Sat, 8 Aug 2020 00:16:24 +0800 Subject: [PATCH] add 3.1.0 changes and fix typo (#52) --- CHANGES.md | 10 ++++++++++ chart/skywalking/README.md | 2 +- chart/skywalking/templates/oap-configmap.yaml | 2 +- chart/skywalking/templates/oap-deployment.yaml | 2 +- chart/skywalking/values-es6.yaml | 4 ++-- chart/skywalking/values.yaml | 4 ++-- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 13ee785..cb96d65 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,16 @@ Changes by Version ================== Release Notes. +3.1.0 +------------------ + +#### Features +- Support SkyWalking 8.1.0 +- Support enable oap dynamic configuration through k8s configmap + +#### Download +- http://skywalking.apache.org/downloads/ + 3.0.0 ------------------ diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md index d1ef3a9..d4b2c87 100644 --- a/chart/skywalking/README.md +++ b/chart/skywalking/README.md @@ -43,7 +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.dynamicConfigEnabled` | 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-configmap.yaml b/chart/skywalking/templates/oap-configmap.yaml index 50efca4..656557e 100644 --- a/chart/skywalking/templates/oap-configmap.yaml +++ b/chart/skywalking/templates/oap-configmap.yaml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- if .Values.oap.dymicConfigEnabled }} +{{- if .Values.oap.dynamicConfigEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml index 47917ec..60d0388 100644 --- a/chart/skywalking/templates/oap-deployment.yaml +++ b/chart/skywalking/templates/oap-deployment.yaml @@ -108,7 +108,7 @@ spec: value: kubernetes - name: SW_CLUSTER_K8S_NAMESPACE value: "{{ .Release.Namespace }}" -{{- if .Values.oap.dymicConfigEnabled }} +{{- if .Values.oap.dynamicConfigEnabled }} - name: SW_CONFIGURATION value: k8s-configmap - name: SW_CONFIG_CONFIGMAP_PERIOD diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml index ce59fb8..0a46fc7 100644 --- a/chart/skywalking/values-es6.yaml +++ b/chart/skywalking/values-es6.yaml @@ -22,10 +22,10 @@ serviceAccounts: oap: name: oap - # When 'dymicConfigEnabled' set to true, enable oap dynamic configuration through k8s configmap， + # When 'dynamicConfigEnabled' 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 + dynamicConfigEnabled: false image: repository: apache/skywalking-oap-server tag: 8.1.0-es6 diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml index 7d56436..6960591 100644 --- a/chart/skywalking/values.yaml +++ b/chart/skywalking/values.yaml @@ -22,10 +22,10 @@ serviceAccounts: oap: name: oap - # When 'dymicConfigEnabled' set to true, enable oap dynamic configuration through k8s configmap， + # When 'dynamicConfigEnabled' 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 + dynamicConfigEnabled: false image: repository: apache/skywalking-oap-server tag: 8.1.0-es7