[skywalking-kubernetes] branch master updated: Add Values for init container in case of using private regestry; fix a whitespace/newline trimming bug (#53)

[innerpeacez]

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

innerpeacez 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 e7073eb  Add Values for init container in case of using private 
regestry;fix a whitespace/newline trimming bug (#53)
e7073eb is described below

commit e7073ebf43bedb51ab02dffa6dafcba6772f84e6
Author: glongzh <glong....@gmail.com>
AuthorDate: Thu Aug 27 09:31:54 2020 +0800

    Add Values for init container in case of using private regestry;fix a 
whitespace/newline trimming bug (#53)
    
    * Add Values for init container in case of using private regestry; Fix 
ingress indent issue
    
    * fix a whitespace/newline trimming bug
---
 chart/skywalking/templates/_helpers.tpl    | 2 +-
 chart/skywalking/templates/ui-ingress.yaml | 4 ++--
 chart/skywalking/values.yaml               | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/chart/skywalking/templates/_helpers.tpl 
b/chart/skywalking/templates/_helpers.tpl
index 0aef730..bf17d47 100644
--- a/chart/skywalking/templates/_helpers.tpl
+++ b/chart/skywalking/templates/_helpers.tpl
@@ -65,7 +65,7 @@ Create the name of the service account to use for the oap 
cluster
 
 {{- define "skywalking.containers.wait-for-es" -}}
 - name: wait-for-elasticsearch
-  image: busybox:1.30
+  image: {{ .Values.initContainer.image }}:{{ .Values.initContainer.tag }}
   imagePullPolicy: IfNotPresent
 {{- if .Values.elasticsearch.enabled }}
   command: ['sh', '-c', 'for i in $(seq 1 60); do nc -z -w3 {{ 
.Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }} {{ 
.Values.elasticsearch.httpPort }} && exit 0 || sleep 5; done; exit 1']
diff --git a/chart/skywalking/templates/ui-ingress.yaml 
b/chart/skywalking/templates/ui-ingress.yaml
index b2ceb31..b12f3bc 100644
--- a/chart/skywalking/templates/ui-ingress.yaml
+++ b/chart/skywalking/templates/ui-ingress.yaml
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 {{- if .Values.ui.ingress.enabled }}
-{{- $serviceName := include "skywalking.ui.fullname" . -}}
-{{- $servicePort := .Values.ui.service.externalPort -}}
+{{- $serviceName := include "skywalking.ui.fullname" . }}
+{{- $servicePort := .Values.ui.service.externalPort }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 6960591..dd4c1a0 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -19,7 +19,9 @@
 
 serviceAccounts:
   oap:
-
+initContainer:
+  image: busybox
+  tag: '1.30'
 oap:
   name: oap
   # When 'dynamicConfigEnabled' set to true, enable oap dynamic configuration 
through k8s configmap，