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 ab5567a add .Values.oap.initEs to work with ES initial (#88)
ab5567a is described below
commit ab5567a921cfca346ceba3b360cb6766e53fd4c5
Author: williamyao1982 <[email protected]>
AuthorDate: Thu Jun 30 21:11:19 2022 +0800
add .Values.oap.initEs to work with ES initial (#88)
* add .Values.oap.initEs to work with ES initial
* add the new argument description to the document
Co-authored-by: William Yao <[email protected]>
Co-authored-by: kezhenxu94 <[email protected]>
---
README.md | 1 +
chart/skywalking/README.md | 1 +
chart/skywalking/templates/es-init.job.yaml | 2 +-
chart/skywalking/values.yaml | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c7042e2..d229c39 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ There are required values that you must set explicitly when
deploying SkyWalking
| ---- | ----------- | ------- |
| `oap.image.tag` | the OAP docker image tag | `9.1.0` |
| `oap.storageType` | the storage type of the OAP | `elasticsearch`,
`postgresql`, etc. |
+| `oap.initEs` | need to initial ElasticSearch | `true`, `false` |
| `ui.image.tag` | the UI docker image tag | `9.1.0` |
You can set these required values via command line (e.g. `--set
oap.image.tag=9.1.0 --set oap.storageType=elasticsearch`),
diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md
index 0e3fc2e..f845bbe 100644
--- a/chart/skywalking/README.md
+++ b/chart/skywalking/README.md
@@ -45,6 +45,7 @@ The following table lists the configurable parameters of the
Skywalking chart an
| `imagePullSecrets` | Image pull
secrets
| `[]` |
| `oap.name` | OAP
deployment name
| `oap` |
| `oap.dynamicConfigEnabled` | Enable oap
dynamic configuration through k8s configmap
| `false` |
+| `oap.initEs` | Need to
initial ElasticSearch
| `true` |
| `oap.image.repository` | OAP container
image name
| `skywalking.docker.scarf.sh/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/es-init.job.yaml
b/chart/skywalking/templates/es-init.job.yaml
index fb9e0d5..f030cc8 100644
--- a/chart/skywalking/templates/es-init.job.yaml
+++ b/chart/skywalking/templates/es-init.job.yaml
@@ -15,7 +15,7 @@
# https://docs.sentry.io/server/installation/docker/#running-migrations
-{{- if contains "elasticsearch" .Values.oap.storageType }}
+{{- if and .Values.oap.initEs (contains "elasticsearch"
.Values.oap.storageType) }}
apiVersion: batch/v1
kind: Job
metadata:
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 474651a..4b9185d 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -37,6 +37,7 @@ oap:
tag: null # Must be set explicitly
pullPolicy: IfNotPresent
storageType: null
+ initEs: true # Whether need to initial ES
ports:
# add more ports here if you need, for example
# zabbix: 10051
