[skywalking-kubernetes] branch master updated: Fix bug that customized config files are not loaded into es-init job (#66)

[wu...@apache.org]

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 3189820  Fix bug that customized config files are not loaded into es-init job (#66)
3189820 is described below

commit 31898203dceba00550cf78eb5ce979efea562587
Author: Zhenxu Ke <ke...@apache.org>
AuthorDate: Mon Mar 15 22:40:46 2021 +0800

    Fix bug that customized config files are not loaded into es-init job (#66)
---
 chart/skywalking/templates/es-init.job.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/chart/skywalking/templates/es-init.job.yaml b/chart/skywalking/templates/es-init.job.yaml
index 7437e19..fd37625 100644
--- a/chart/skywalking/templates/es-init.job.yaml
+++ b/chart/skywalking/templates/es-init.job.yaml
@@ -91,3 +91,17 @@ spec:
           value: {{ $value | quote }}
         {{- end }}
 {{- end}}
+        volumeMounts:
+          {{- if (.Files.Glob "files/conf.d/oap/**") }}
+            {{ range $path, $bytes := .Files.Glob "files/conf.d/oap/**" }}
+            - name: skywalking-oap-override
+              mountPath: {{ print "/skywalking/config/" ($path | replace "files/conf.d/oap/" "") }}
+              subPath: {{ $path | replace "files/conf.d/oap/" "" | b64enc | replace "=" "-" }}
+            {{- end }}
+            {{- end }}
+      volumes:
+        {{- if (.Files.Glob "files/conf.d/oap/**") }}
+        - name: skywalking-oap-override
+          configMap:
+            name: {{ template "skywalking.fullname" . }}-oap-cm-override
+        {{- end }}