diff --git a/chart/skywalking/templates/_helpers.tpl b/chart/skywalking/templates/_helpers.tpl index 0aef7305842c2fa291dd79f0fe93185a5a1010d6..bf17d47afa2da88883975bdcf65c78330b5ff238 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 b2ceb312e53e6f5d215dfa12e8e885f48f6a5804..b12f3bc332fc83a5675d6e85df4371cb3197a663 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 6960591176d9f9bdfa4f8e6aa76c64a96e5d5ace..dd4c1a071612d9fb87dd76c13e975a214c9bf2f7 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,