From 97300bd9a4aba11aa9a506cc39a95fca079e2c54 Mon Sep 17 00:00:00 2001 From: Michael Primeaux Date: Mon, 4 Oct 2021 03:54:05 -0500 Subject: [PATCH] Incorrect indentation for `extraVolumeMounts`, `extraEnvs`, `envFrom` in `statefulset.yaml`. (#80) * Changes - Fixes incorrect indentation for `extraVolumeMounts`, `extraEnvs`, and `envFrom`. Signed-off-by: Michael Primeaux * Changes: - Increment version of the opensearch dashboards chart until PR #75 is merged. Signed-off-by: Michael Primeaux * - Amended CHANGELOGs Signed-off-by: Michael Primeaux --- charts/opensearch-dashboards/CHANGELOG.md | 15 +++++++++++++-- charts/opensearch-dashboards/Chart.yaml | 2 +- charts/opensearch/CHANGELOG.md | 14 +++++++++++++- charts/opensearch/Chart.yaml | 2 +- charts/opensearch/templates/statefulset.yaml | 12 ++++++------ 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md index 8128fc79..1fd3ce20 100644 --- a/charts/opensearch-dashboards/CHANGELOG.md +++ b/charts/opensearch-dashboards/CHANGELOG.md @@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security +--- +## [1.0.4] +### Added +### Changed +- Amended installation instructions. +### Deprecated +### Removed +### Fixed +### Security + --- ## [1.0.2] @@ -27,5 +37,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security -[Unreleasedd]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.2...HEAD -[opensearch-dashboards-1.0.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.1...opensearch-dashboards-1.0.2 +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.4...HEAD +[1.0.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.2...opensearch-1.0.4 +[1.0.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.1...opensearch-dashboards-1.0.2 diff --git a/charts/opensearch-dashboards/Chart.yaml b/charts/opensearch-dashboards/Chart.yaml index 560606bd..a275e9d3 100644 --- a/charts/opensearch-dashboards/Chart.yaml +++ b/charts/opensearch-dashboards/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.3 +version: 1.0.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 22a6f549..f5fcc76e 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security +--- +## [1.0.4] +### Added +### Changed +- Amended installation instructions. +### Deprecated +### Removed +### Fixed +- [ISSUE-65](https://github.com/opensearch-project/helm-charts/issues/65): Incorrect indentation for `extraVolumeMounts`, `extraEnvs`, `envFrom` in `statefulset.yaml`. +### Security + --- ## [1.0.2] @@ -27,5 +38,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security -[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.2...HEAD +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.4...HEAD +[1.0.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.2...opensearch-1.0.4 [1.0.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.1...opensearch-1.0.2 diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 516fc854..a623821a 100644 --- a/charts/opensearch/Chart.yaml +++ b/charts/opensearch/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.3 +version: 1.0.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/opensearch/templates/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml index 50875277..920f2742 100644 --- a/charts/opensearch/templates/statefulset.yaml +++ b/charts/opensearch/templates/statefulset.yaml @@ -251,8 +251,8 @@ spec: fi cp -a {{ .Values.opensearchHome }}/config/opensearch.keystore /tmp/keystore/ - env: {{ toYaml .Values.extraEnvs | nindent 10 }} - envFrom: {{ toYaml .Values.envFrom | nindent 10 }} + env: {{ toYaml .Values.extraEnvs | nindent 8 }} + envFrom: {{ toYaml .Values.envFrom | nindent 8 }} resources: {{ toYaml .Values.initResources | nindent 10 }} volumeMounts: - name: keystore @@ -318,11 +318,11 @@ spec: value: "{{ $enabled }}" {{- end }} {{- if .Values.extraEnvs }} -{{ toYaml .Values.extraEnvs | indent 10 }} +{{ toYaml .Values.extraEnvs | indent 8 }} {{- end }} {{- if .Values.envFrom }} envFrom: -{{ toYaml .Values.envFrom | indent 10 }} +{{ toYaml .Values.envFrom | indent 8 }} {{- end }} volumeMounts: {{- if .Values.persistence.enabled }} @@ -387,9 +387,9 @@ spec: # to continue with backwards compatibility this is being kept # whilst also allowing for yaml to be specified too. {{- if eq "string" (printf "%T" .Values.extraVolumeMounts) }} -{{ tpl .Values.extraVolumeMounts . | indent 10 }} +{{ tpl .Values.extraVolumeMounts . | indent 8 }} {{- else }} -{{ toYaml .Values.extraVolumeMounts | indent 10 }} +{{ toYaml .Values.extraVolumeMounts | indent 8 }} {{- end }} {{- end }} {{- if .Values.masterTerminationFix }}