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
commit 2faf6eb40dad6b8e62ffd809c5720564a8642d2b Author: innerpeacez <zhaihw0...@163.com> AuthorDate: Wed Aug 14 11:57:28 2019 +0800 helm3 and 6.3.0 --- .../{ => helm2}/6.0.0-GA/skywalking/.helmignore | 0 .../{ => helm2}/6.0.0-GA/skywalking/Chart.yaml | 0 .../{ => helm2}/6.0.0-GA/skywalking/README.md | 0 .../6.0.0-GA/skywalking/templates/NOTES.txt | 0 .../6.0.0-GA/skywalking/templates/_helpers.tpl | 0 .../elasticsearch/elasticsearch-service.yaml | 0 .../elasticsearch/elasticsearch-statefulset.yaml | 0 .../skywalking/templates/oap/oap-config.yaml | 0 .../skywalking/templates/oap/oap-deployment.yaml | 0 .../skywalking/templates/oap/oap-role.yaml | 0 .../skywalking/templates/oap/oap-rolebinding.yaml | 0 .../skywalking/templates/oap/oap-service.yaml | 0 .../templates/oap/oap-serviceaccount.yaml | 0 .../skywalking/templates/ui/ui-deployment.yaml | 0 .../skywalking/templates/ui/ui-ingress.yaml | 0 .../skywalking/templates/ui/ui-service.yaml | 0 .../{ => helm2}/6.0.0-GA/skywalking/values.yaml | 0 .../{ => helm2}/6.1.0/skywalking/.helmignore | 0 helm-chart/{ => helm2}/6.1.0/skywalking/Chart.yaml | 0 helm-chart/{ => helm2}/6.1.0/skywalking/OWNERS | 0 helm-chart/{ => helm2}/6.1.0/skywalking/README.md | 0 .../{ => helm2}/6.1.0/skywalking/requirements.lock | 0 .../{ => helm2}/6.1.0/skywalking/requirements.yaml | 0 .../6.1.0/skywalking/templates/NOTES.txt | 0 .../6.1.0/skywalking/templates/_helpers.tpl | 0 .../6.1.0/skywalking/templates/es-init.job.yaml | 0 .../6.1.0/skywalking/templates/oap-deployment.yaml | 0 .../6.1.0/skywalking/templates/oap-role.yaml | 0 .../skywalking/templates/oap-rolebinding.yaml | 0 .../skywalking/templates/oap-serviceaccount.yaml | 0 .../6.1.0/skywalking/templates/oap-svc.yaml | 0 .../6.1.0/skywalking/templates/ui-deployment.yaml | 0 .../6.1.0/skywalking/templates/ui-ingress.yaml | 0 .../6.1.0/skywalking/templates/ui-svc.yaml | 0 .../{ => helm2}/6.1.0/skywalking/values.yaml | 0 .../{6.1.0 => helm3/6.3.0}/skywalking/.helmignore | 0 .../{6.1.0 => helm3/6.3.0}/skywalking/Chart.yaml | 10 ++- .../{6.1.0 => helm3/6.3.0}/skywalking/OWNERS | 0 .../{6.1.0 => helm3/6.3.0}/skywalking/README.md | 83 ++++++++++++++++++++-- .../6.3.0}/skywalking/templates/NOTES.txt | 0 .../6.3.0}/skywalking/templates/_helpers.tpl | 0 .../6.3.0}/skywalking/templates/es-init.job.yaml | 0 .../skywalking/templates/oap-deployment.yaml | 0 .../6.3.0}/skywalking/templates/oap-role.yaml | 0 .../skywalking/templates/oap-rolebinding.yaml | 0 .../skywalking/templates/oap-serviceaccount.yaml | 0 .../6.3.0}/skywalking/templates/oap-svc.yaml | 0 .../6.3.0}/skywalking/templates/ui-deployment.yaml | 0 .../6.3.0}/skywalking/templates/ui-ingress.yaml | 0 .../6.3.0}/skywalking/templates/ui-svc.yaml | 0 .../{6.1.0 => helm3/6.3.0}/skywalking/values.yaml | 4 +- 51 files changed, 86 insertions(+), 11 deletions(-) diff --git a/helm-chart/6.0.0-GA/skywalking/.helmignore b/helm-chart/helm2/6.0.0-GA/skywalking/.helmignore similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/.helmignore rename to helm-chart/helm2/6.0.0-GA/skywalking/.helmignore diff --git a/helm-chart/6.0.0-GA/skywalking/Chart.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/Chart.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/README.md b/helm-chart/helm2/6.0.0-GA/skywalking/README.md similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/README.md rename to helm-chart/helm2/6.0.0-GA/skywalking/README.md diff --git a/helm-chart/6.0.0-GA/skywalking/templates/NOTES.txt b/helm-chart/helm2/6.0.0-GA/skywalking/templates/NOTES.txt similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/NOTES.txt rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/NOTES.txt diff --git a/helm-chart/6.0.0-GA/skywalking/templates/_helpers.tpl b/helm-chart/helm2/6.0.0-GA/skywalking/templates/_helpers.tpl similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/_helpers.tpl rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/_helpers.tpl diff --git a/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-config.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-config.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-role.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-role.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-role.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-role.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-service.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-service.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-service.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-service.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-service.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-service.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/templates/ui/ui-service.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-service.yaml diff --git a/helm-chart/6.0.0-GA/skywalking/values.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/values.yaml similarity index 100% rename from helm-chart/6.0.0-GA/skywalking/values.yaml rename to helm-chart/helm2/6.0.0-GA/skywalking/values.yaml diff --git a/helm-chart/6.1.0/skywalking/.helmignore b/helm-chart/helm2/6.1.0/skywalking/.helmignore similarity index 100% copy from helm-chart/6.1.0/skywalking/.helmignore copy to helm-chart/helm2/6.1.0/skywalking/.helmignore diff --git a/helm-chart/6.1.0/skywalking/Chart.yaml b/helm-chart/helm2/6.1.0/skywalking/Chart.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/Chart.yaml copy to helm-chart/helm2/6.1.0/skywalking/Chart.yaml diff --git a/helm-chart/6.1.0/skywalking/OWNERS b/helm-chart/helm2/6.1.0/skywalking/OWNERS similarity index 100% copy from helm-chart/6.1.0/skywalking/OWNERS copy to helm-chart/helm2/6.1.0/skywalking/OWNERS diff --git a/helm-chart/6.1.0/skywalking/README.md b/helm-chart/helm2/6.1.0/skywalking/README.md similarity index 100% copy from helm-chart/6.1.0/skywalking/README.md copy to helm-chart/helm2/6.1.0/skywalking/README.md diff --git a/helm-chart/6.1.0/skywalking/requirements.lock b/helm-chart/helm2/6.1.0/skywalking/requirements.lock similarity index 100% rename from helm-chart/6.1.0/skywalking/requirements.lock rename to helm-chart/helm2/6.1.0/skywalking/requirements.lock diff --git a/helm-chart/6.1.0/skywalking/requirements.yaml b/helm-chart/helm2/6.1.0/skywalking/requirements.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/requirements.yaml rename to helm-chart/helm2/6.1.0/skywalking/requirements.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/NOTES.txt b/helm-chart/helm2/6.1.0/skywalking/templates/NOTES.txt similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/NOTES.txt copy to helm-chart/helm2/6.1.0/skywalking/templates/NOTES.txt diff --git a/helm-chart/6.1.0/skywalking/templates/_helpers.tpl b/helm-chart/helm2/6.1.0/skywalking/templates/_helpers.tpl similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/_helpers.tpl copy to helm-chart/helm2/6.1.0/skywalking/templates/_helpers.tpl diff --git a/helm-chart/6.1.0/skywalking/templates/es-init.job.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/es-init.job.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/es-init.job.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/es-init.job.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-deployment.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-deployment.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-role.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-role.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/oap-role.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-role.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-rolebinding.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-rolebinding.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-serviceaccount.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-serviceaccount.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-svc.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-svc.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/oap-svc.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-svc.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/ui-deployment.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/ui-deployment.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/ui-ingress.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/ui-ingress.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/ui-svc.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/ui-svc.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/templates/ui-svc.yaml copy to helm-chart/helm2/6.1.0/skywalking/templates/ui-svc.yaml diff --git a/helm-chart/6.1.0/skywalking/values.yaml b/helm-chart/helm2/6.1.0/skywalking/values.yaml similarity index 100% copy from helm-chart/6.1.0/skywalking/values.yaml copy to helm-chart/helm2/6.1.0/skywalking/values.yaml diff --git a/helm-chart/6.1.0/skywalking/.helmignore b/helm-chart/helm3/6.3.0/skywalking/.helmignore similarity index 100% rename from helm-chart/6.1.0/skywalking/.helmignore rename to helm-chart/helm3/6.3.0/skywalking/.helmignore diff --git a/helm-chart/6.1.0/skywalking/Chart.yaml b/helm-chart/helm3/6.3.0/skywalking/Chart.yaml similarity index 63% rename from helm-chart/6.1.0/skywalking/Chart.yaml rename to helm-chart/helm3/6.3.0/skywalking/Chart.yaml index 5c9a852..b12bc7d 100644 --- a/helm-chart/6.1.0/skywalking/Chart.yaml +++ b/helm-chart/helm3/6.3.0/skywalking/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: skywalking home: https://www.elastic.co/products/elasticsearch version: 0.1.0 -appVersion: 6.1.0 +appVersion: 6.3.0 description: Apache SkyWalking APM System icon: https://github.com/apache/skywalking-website/blob/master/docs/.vuepress/public/assets/logo.svg sources: @@ -11,4 +11,10 @@ maintainers: - name: hanahmily email: hanahm...@gmail.com - name: innerpeacez - email: innerpeace.z...@gmail.com \ No newline at end of file + email: innerpeace.z...@gmail.com + +dependencies: + - name: elasticsearch + version: ~1.28.2 + repository: https://kubernetes-charts.storage.googleapis.com/ + condition: elasticsearch.enabled \ No newline at end of file diff --git a/helm-chart/6.1.0/skywalking/OWNERS b/helm-chart/helm3/6.3.0/skywalking/OWNERS similarity index 100% rename from helm-chart/6.1.0/skywalking/OWNERS rename to helm-chart/helm3/6.3.0/skywalking/OWNERS diff --git a/helm-chart/6.1.0/skywalking/README.md b/helm-chart/helm3/6.3.0/skywalking/README.md similarity index 52% rename from helm-chart/6.1.0/skywalking/README.md rename to helm-chart/helm3/6.3.0/skywalking/README.md index a78e124..0421897 100644 --- a/helm-chart/6.1.0/skywalking/README.md +++ b/helm-chart/helm3/6.3.0/skywalking/README.md @@ -9,14 +9,15 @@ This chart bootstraps a [Apache SkyWalking](https://skywalking.apache.org/) depl ## Prerequisites - Kubernetes 1.9.6+ - - PV dynamic provisioning support on the underlying infrastructure + - PV dynamic provisioning support on the underlying infrastructure (StorageClass) + - Helm 3 ## Installing the Chart To install the chart with the release name `my-release`: -```console -$ helm install --name my-release skywalking +```shell +$ helm install my-release skywalking -n <namespace> ``` The command deploys Apache Skywalking on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. @@ -27,8 +28,8 @@ The command deploys Apache Skywalking on the Kubernetes cluster in the default c To uninstall/delete the `my-release` deployment: -```console -$ helm delete my-release +```shell +$ helm delete my-release -n <namespace> ``` The command removes all the Kubernetes components associated with the chart and deletes the release. @@ -74,18 +75,86 @@ The following table lists the configurable parameters of the Skywalking chart an | `ui.service.annotations` | Kubernetes service annotations | `{}` | | `ui.service.loadBalancerSourceRanges` | Limit load balancer source IPs to list of CIDRs (where available)) | `[]` | | `elasticsearch.enabled` | Spin up a new elasticsearch cluster for SkyWalking | `true` | +| `elasticsearch.client.name` | `client` | Client component name | +| `elasticsearch.client.replicas` | `2` | Client node replicas (deployment) | +| `elasticsearch.client.resources` | `{} - cpu limit must be an integer` | Client node resources requests & limits | +| `elasticsearch.client.priorityClassName` | `nil` | Client priorityClass | +| `elasticsearch.client.heapSize` | `512m` | Client node heap size | +| `elasticsearch.client.podAnnotations` | `{}` | Client Deployment annotations | +| `elasticsearch.client.nodeSelector` | `{}` | Node labels for client pod assignment | +| `elasticsearch.client.tolerations` | `[]` | Client tolerations | +| `elasticsearch.client.serviceAnnotations` | `{}` | Client Service annotations | +| `elasticsearch.client.serviceType` | `ClusterIP` | Client service type | +| `elasticsearch.client.httpNodePort` | `nil` | Client service HTTP NodePort port number. Has no effect if client.serviceType is not `NodePort`. | +| `elasticsearch.client.loadBalancerIP` | `{}` | Client loadBalancerIP | +| `elasticsearch.client.loadBalancerSourceRanges` | `{}` | Client loadBalancerSourceRanges | +| `elasticsearch.client.antiAffinity` | `soft` | Client anti-affinity policy | +| `elasticsearch.client.nodeAffinity` | `{}` | Client node affinity policy | +| `elasticsearch.client.initResources` | `{}` | Client initContainer resources requests & limits | +| `elasticsearch.client.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for client | +| `elasticsearch.client.ingress.enabled` | `false` | Enable Client Ingress | +| `elasticsearch.client.ingress.user` | `nil` | If this & password are set, enable basic-auth on ingress | +| `elasticsearch.client.ingress.password` | `nil` | If this & user are set, enable basic-auth on ingress | +| `elasticsearch.client.ingress.annotations` | `{}` | Client Ingress annotations | +| `elasticsearch.client.ingress.hosts` | `[]` | Client Ingress Hostnames | +| `elasticsearch.client.ingress.tls` | `[]` | Client Ingress TLS configuration | +| `elasticsearch.client.exposeTransportPort` | `false` | Expose transport port 9300 on client service (ClusterIP) | +| `elasticsearch.master.initResources` | `{}` | Master initContainer resources requests & limits | +| `elasticsearch.master.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for master | +| `elasticsearch.master.exposeHttp` | `false` | Expose http port 9200 on master Pods for monitoring, etc | +| `elasticsearch.master.name` | `master` | Master component name | +| `elasticsearch.master.replicas` | `2` | Master node replicas (deployment) | +| `elasticsearch.master.resources` | `{} - cpu limit must be an integer` | Master node resources requests & limits | +| `elasticsearch.master.priorityClassName` | `nil` | Master priorityClass | +| `elasticsearch.master.podAnnotations` | `{}` | Master Deployment annotations | +| `elasticsearch.master.nodeSelector` | `{}` | Node labels for master pod assignment | +| `elasticsearch.master.tolerations` | `[]` | Master tolerations | +| `elasticsearch.master.heapSize` | `512m` | Master node heap size | +| `elasticsearch.master.name` | `master` | Master component name | +| `elasticsearch.master.persistence.enabled` | `true` | Master persistent enabled/disabled | +| `elasticsearch.master.persistence.name` | `data` | Master statefulset PVC template name | +| `elasticsearch.master.persistence.size` | `4Gi` | Master persistent volume size | +| `elasticsearch.master.persistence.storageClass` | `nil` | Master persistent volume Class | +| `elasticsearch.master.persistence.accessMode` | `ReadWriteOnce` | Master persistent Access Mode | +| `elasticsearch.master.readinessProbe` | see `values.yaml` for defaults | Master container readiness probes | +| `elasticsearch.master.antiAffinity` | `soft` | Master anti-affinity policy | +| `elasticsearch.master.nodeAffinity` | `{}` | Master node affinity policy | +| `elasticsearch.master.podManagementPolicy` | `OrderedReady` | Master pod creation strategy | +| `elasticsearch.master.updateStrategy` | `{type: "onDelete"}` | Master node update strategy policy | +| `elasticsearch.data.initResources` | `{}` | Data initContainer resources requests & limits | +| `elasticsearch.data.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for data | +| `elasticsearch.data.exposeHttp` | `false` | Expose http port 9200 on data Pods for monitoring, etc | +| `elasticsearch.data.replicas` | `2` | Data node replicas (statefulset) | +| `elasticsearch.data.resources` | `{} - cpu limit must be an integer` | Data node resources requests & limits | +| `elasticsearch.data.priorityClassName` | `nil` | Data priorityClass | +| `elasticsearch.data.heapSize` | `1536m` | Data node heap size | +| `elasticsearch.data.hooks.drain.enabled` | `true` | Data nodes: Enable drain pre-stop and post-start hook | +| `elasticsearch.data.persistence.enabled` | `true` | Data persistent enabled/disabled | +| `elasticsearch.data.persistence.name` | `data` | Data statefulset PVC template name | +| `elasticsearch.data.persistence.size` | `30Gi` | Data persistent volume size | +| `elasticsearch.data.persistence.storageClass` | `nil` | Data persistent volume Class | +| `elasticsearch.data.persistence.accessMode` | `ReadWriteOnce` | Data persistent Access Mode | +| `elasticsearch.data.readinessProbe` | see `values.yaml` for defaults | Readiness probes for data-containers | +| `elasticsearch.data.podAnnotations` | `{}` | Data StatefulSet annotations | +| `elasticsearch.data.nodeSelector` | `{}` | Node labels for data pod assignment | +| `elasticsearch.data.tolerations` | `[]` | Data tolerations | +| `elasticsearch.data.terminationGracePeriodSeconds` | `3600` | Data termination grace period (seconds) | +| `elasticsearch.data.antiAffinity` | `soft` | Data anti-affinity policy | +| `elasticsearch.data.nodeAffinity` | `{}` | Data node affinity policy | +| `elasticsearch.data.podManagementPolicy` | `OrderedReady` | Data pod creation strategy | +| `elasticsearch.data.updateStrategy` | `{type: "onDelete"}` | Data node update strategy policy | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```console -$ helm install skywalking --name=myrelease --set nameOverride=newSkywalking +$ helm install myrelease skywalking --set nameOverride=newSkywalking ``` Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, ```console -$ helm install skywalking --name my-release -f values.yaml +$ helm install my-release skywalking -f values.yaml ``` > **Tip**: You can use the default [values.yaml](values.yaml) diff --git a/helm-chart/6.1.0/skywalking/templates/NOTES.txt b/helm-chart/helm3/6.3.0/skywalking/templates/NOTES.txt similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/NOTES.txt rename to helm-chart/helm3/6.3.0/skywalking/templates/NOTES.txt diff --git a/helm-chart/6.1.0/skywalking/templates/_helpers.tpl b/helm-chart/helm3/6.3.0/skywalking/templates/_helpers.tpl similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/_helpers.tpl rename to helm-chart/helm3/6.3.0/skywalking/templates/_helpers.tpl diff --git a/helm-chart/6.1.0/skywalking/templates/es-init.job.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/es-init.job.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/es-init.job.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/es-init.job.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-deployment.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-deployment.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-role.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-role.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/oap-role.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-role.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-rolebinding.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-rolebinding.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-serviceaccount.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-serviceaccount.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/oap-svc.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-svc.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/oap-svc.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-svc.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/ui-deployment.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/ui-deployment.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/ui-ingress.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/ui-ingress.yaml diff --git a/helm-chart/6.1.0/skywalking/templates/ui-svc.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/ui-svc.yaml similarity index 100% rename from helm-chart/6.1.0/skywalking/templates/ui-svc.yaml rename to helm-chart/helm3/6.3.0/skywalking/templates/ui-svc.yaml diff --git a/helm-chart/6.1.0/skywalking/values.yaml b/helm-chart/helm3/6.3.0/skywalking/values.yaml similarity index 99% rename from helm-chart/6.1.0/skywalking/values.yaml rename to helm-chart/helm3/6.3.0/skywalking/values.yaml index d1db10f..c9c8de1 100644 --- a/helm-chart/6.1.0/skywalking/values.yaml +++ b/helm-chart/helm3/6.3.0/skywalking/values.yaml @@ -9,7 +9,7 @@ oap: name: skywalking-oap image: repository: apache/skywalking-oap-server - tag: 6.1.0 + tag: 6.3.0 pullPolicy: IfNotPresent ports: grpc: 11800 @@ -39,7 +39,7 @@ ui: replicas: 1 image: repository: apache/skywalking-ui - tag: 6.1.0 + tag: 6.3.0 pullPolicy: IfNotPresent # podAnnotations: # example: oap-foo