diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 924800a48..12b35fafe 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -66,9 +66,9 @@ helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.3.0 | `esMajorVersion` | Used to set major version specific configuration. If you are using a custom image and not running the default Elasticsearch version you will need to set this to the version you are running (e.g. `esMajorVersion: 6`) | `""` | | `esConfig` | Allows you to add any config files in `/usr/share/elasticsearch/config/` such as `elasticsearch.yml` and `log4j2.properties`. See [values.yaml](./values.yaml) for an example of the formatting. | `{}` | | `extraEnvs` | Extra [environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config) which will be appended to the `env:` definition for the container | `[]` | -| `extraVolumes` | Additional volumes to be passed to the `tpl` function | | -| `extraVolumeMounts` | Additional volumeMounts to be passed to the `tpl` function | | -| `extraInitContainers` | Additional init containers to be passed to the `tpl` function | | +| `extraVolumes` | Templatable string of additional volumes to be passed to the `tpl` function | `""` | +| `extraVolumeMounts` | Templatable string of additional volumeMounts to be passed to the `tpl` function | `""` | +| `extraInitContainers` | Templatable string of additional init containers to be passed to the `tpl` function | `""` | | `secretMounts` | Allows you easily mount a secret as a file inside the statefulset. Useful for mounting certificates and other secrets. See [values.yaml](./values.yaml) for an example | `[]` | | `image` | The Elasticsearch docker image | `docker.elastic.co/elasticsearch/elasticsearch` | | `imageTag` | The Elasticsearch docker image tag | `7.3.0` | diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 13ca0626d..eaf9b3a99 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -90,16 +90,16 @@ persistence: enabled: true annotations: {} -extraVolumes: [] +extraVolumes: "" # - name: extras # emptyDir: {} -extraVolumeMounts: [] +extraVolumeMounts: "" # - name: extras # mountPath: /usr/share/extras # readOnly: true -extraInitContainers: [] +extraInitContainers: "" # - name: do-something # image: busybox # command: ['do', 'something'] diff --git a/filebeat/README.md b/filebeat/README.md index 7a6b3ec32..cbfe93605 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -46,8 +46,8 @@ helm install --name filebeat elastic/filebeat --set imageTag=7.3.0 | ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | | `filebeatConfig` | Allows you to add any config files in `/usr/share/filebeat` such as `filebeat.yml`. See [values.yaml](./values.yaml) for an example of the formatting with the default configuration. | see [values.yaml](./values.yaml) | | `extraEnvs` | Extra [environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config) which will be appended to the `env:` definition for the container | `[]` | -| `extraVolumeMounts` | Any extra volumes mounts to define for the Filebeat container | `[]` | -| `extraVolumes` | Any extra volumes to define for the pod | `[]` | +| `extraVolumeMounts` | Templatable string of additional volumeMounts to be passed to the `tpl` function | `""` | +| `extraVolumes` | Templatable string of additional volumes to be passed to the `tpl` function | `""` | | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Filebeat registry data | `/var/lib` | | `image` | The Filebeat docker image | `docker.elastic.co/beats/filebeat` | | `imageTag` | The Filebeat docker image tag | `7.3.0` | diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 3da889cdd..f4fc22330 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -21,12 +21,12 @@ extraEnvs: [] # - name: MY_ENVIRONMENT_VAR # value: the_value_goes_here -extraVolumeMounts: [] +extraVolumeMounts: "" # - name: extras # mountPath: /usr/share/extras # readOnly: true -extraVolumes: [] +extraVolumes: "" # - name: extras # emptyDir: {} diff --git a/helpers/release.py b/helpers/release.py index 811bde945..145995ff1 100644 --- a/helpers/release.py +++ b/helpers/release.py @@ -30,6 +30,9 @@ def run(cmd): for filepath in glob.iglob('*/Chart.yaml'): chart = os.path.split(os.path.dirname(filepath))[-1] + # Download dependencies + run(['helm', 'dependency', 'update', chart]) + # Package up the chart run(['helm', 'package', chart, '--destination', chart]) diff --git a/metricbeat/README.md b/metricbeat/README.md index 81b60827a..e48443f36 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -42,8 +42,8 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.3.0 | ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | | `metricbeatConfig` | Allows you to add any config files in `/usr/share/metricbeat` such as `metricbeat.yml`. See [values.yaml](./values.yaml) for an example of the formatting with the default configuration. | see [values.yaml](./values.yaml) | | `extraEnvs` | Extra [environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config) which will be appended to the `env:` definition for the container | `[]` | -| `extraVolumeMounts` | Any extra volumes mounts to define for the Metricbeat container | `[]` | -| `extraVolumes` | Any extra volumes to define for the pod | `[]` | +| `extraVolumeMounts` | Templatable string of additional volumeMounts to be passed to the `tpl` function | `""` | +| `extraVolumes` | Templatable string of additional volumes to be passed to the `tpl` function | `""` | | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Metricbeat registry data | `/var/lib` | | `image` | The Metricbeat docker image | `docker.elastic.co/beats/metricbeat` | | `imageTag` | The Metricbeat docker image tag | `7.3.0` | diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 29996d3f4..3e628379c 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -72,12 +72,12 @@ extraEnvs: [] # - name: MY_ENVIRONMENT_VAR # value: the_value_goes_here -extraVolumeMounts: [] +extraVolumeMounts: "" # - name: extras # mountPath: /usr/share/extras # readOnly: true -extraVolumes: [] +extraVolumes: "" # - name: extras # emptyDir: {}