[skywalking-kubernetes] branch master updated: enhancement: allow mounting binary data files (#63)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 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 5eddeb7  enhancement: allow mounting binary data files (#63)
5eddeb7 is described below

commit 5eddeb7f0f95f679c3eb82b391015cdcd1ed2d7c
Author: Zhenxu Ke <ke...@apache.org>
AuthorDate: Wed Dec 9 22:39:14 2020 +0800

    enhancement: allow mounting binary data files (#63)
---
 .github/workflows/e2e.ci.yaml                   | 2 +-
 .github/workflows/e2e.compatibility.yaml        | 6 ++----
 chart/skywalking/templates/oap-cm-override.yaml | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index 8a71f18..f219af0 100644
--- a/.github/workflows/e2e.ci.yaml
+++ b/.github/workflows/e2e.ci.yaml
@@ -43,7 +43,7 @@ jobs:
           repository: apache/skywalking
           submodules: true
           path: main
-          ref: c95a9134925cbe8101dc72dbaca38269eb3dc3b1
+          ref: 5e4b16cbfc96f80bd86eb6a98ddcf60f0959c9b1
 
       - uses: actions/cache@v2
         with:
diff --git a/.github/workflows/e2e.compatibility.yaml b/.github/workflows/e2e.compatibility.yaml
index 0592998..af6e03c 100644
--- a/.github/workflows/e2e.compatibility.yaml
+++ b/.github/workflows/e2e.compatibility.yaml
@@ -33,9 +33,7 @@ jobs:
     strategy:
       matrix:
         tag:
-          - 8.2.0-es6
-          - 8.1.0-es6
-          - 8.0.1-es6
+          - 8.3.0-es6
     env:
       TAG: ${{ matrix.tag }}
     name: ${{ matrix.tag }}
@@ -46,7 +44,7 @@ jobs:
           repository: apache/skywalking
           submodules: true
           path: main
-          ref: c95a9134925cbe8101dc72dbaca38269eb3dc3b1
+          ref: 5e4b16cbfc96f80bd86eb6a98ddcf60f0959c9b1
 
       - name: Prepare envrionment
         run: bash ${SCRIPTS_DIR}/pre.sh
diff --git a/chart/skywalking/templates/oap-cm-override.yaml b/chart/skywalking/templates/oap-cm-override.yaml
index f89884d..d39b97d 100644
--- a/chart/skywalking/templates/oap-cm-override.yaml
+++ b/chart/skywalking/templates/oap-cm-override.yaml
@@ -22,9 +22,9 @@ metadata:
     app: {{ template "skywalking.name" . }}
     release: {{ .Release.Name }}
     component: {{ .Values.oap.name }}
-data:
+binaryData:
   {{ range $path, $bytes := .Files.Glob "files/conf.d/oap/**" }}
   {{- $path | replace "files/conf.d/oap/" "" | b64enc | replace "=" "-" | indent 2 }}: |
-  {{ $.Files.Get $path | indent 4 }}
+  {{ $.Files.Get $path | b64enc | indent 4 }}
   {{ end }}
   {{ end }}