Skip to content

Commit 97300bd

Browse files
authored
Incorrect indentation for extraVolumeMounts, extraEnvs, envFrom in statefulset.yaml. (#80)
* Changes - Fixes incorrect indentation for `extraVolumeMounts`, `extraEnvs`, and `envFrom`. Signed-off-by: Michael Primeaux <[email protected]> * Changes: - Increment version of the opensearch dashboards chart until PR #75 is merged. Signed-off-by: Michael Primeaux <[email protected]> * - Amended CHANGELOGs Signed-off-by: Michael Primeaux <[email protected]>
1 parent 14244f2 commit 97300bd

File tree

5 files changed

+34
-11
lines changed

5 files changed

+34
-11
lines changed

charts/opensearch-dashboards/CHANGELOG.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313
### Fixed
1414
### Security
1515

16+
---
17+
## [1.0.4]
18+
### Added
19+
### Changed
20+
- Amended installation instructions.
21+
### Deprecated
22+
### Removed
23+
### Fixed
24+
### Security
25+
1626
---
1727
## [1.0.2]
1828

@@ -27,5 +37,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2737
### Fixed
2838
### Security
2939

30-
[Unreleasedd]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.2...HEAD
31-
[opensearch-dashboards-1.0.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.1...opensearch-dashboards-1.0.2
40+
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.4...HEAD
41+
[1.0.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.2...opensearch-1.0.4
42+
[1.0.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.1...opensearch-dashboards-1.0.2

charts/opensearch-dashboards/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.0.3
18+
version: 1.0.4
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/opensearch/CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313
### Fixed
1414
### Security
1515

16+
---
17+
## [1.0.4]
18+
### Added
19+
### Changed
20+
- Amended installation instructions.
21+
### Deprecated
22+
### Removed
23+
### Fixed
24+
- [ISSUE-65](https://github.com/opensearch-project/helm-charts/issues/65): Incorrect indentation for `extraVolumeMounts`, `extraEnvs`, `envFrom` in `statefulset.yaml`.
25+
### Security
26+
1627
---
1728
## [1.0.2]
1829

@@ -27,5 +38,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2738
### Fixed
2839
### Security
2940

30-
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.2...HEAD
41+
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.4...HEAD
42+
[1.0.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.2...opensearch-1.0.4
3143
[1.0.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.1...opensearch-1.0.2

charts/opensearch/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.0.3
18+
version: 1.0.4
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/opensearch/templates/statefulset.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ spec:
251251
fi
252252
253253
cp -a {{ .Values.opensearchHome }}/config/opensearch.keystore /tmp/keystore/
254-
env: {{ toYaml .Values.extraEnvs | nindent 10 }}
255-
envFrom: {{ toYaml .Values.envFrom | nindent 10 }}
254+
env: {{ toYaml .Values.extraEnvs | nindent 8 }}
255+
envFrom: {{ toYaml .Values.envFrom | nindent 8 }}
256256
resources: {{ toYaml .Values.initResources | nindent 10 }}
257257
volumeMounts:
258258
- name: keystore
@@ -318,11 +318,11 @@ spec:
318318
value: "{{ $enabled }}"
319319
{{- end }}
320320
{{- if .Values.extraEnvs }}
321-
{{ toYaml .Values.extraEnvs | indent 10 }}
321+
{{ toYaml .Values.extraEnvs | indent 8 }}
322322
{{- end }}
323323
{{- if .Values.envFrom }}
324324
envFrom:
325-
{{ toYaml .Values.envFrom | indent 10 }}
325+
{{ toYaml .Values.envFrom | indent 8 }}
326326
{{- end }}
327327
volumeMounts:
328328
{{- if .Values.persistence.enabled }}
@@ -387,9 +387,9 @@ spec:
387387
# to continue with backwards compatibility this is being kept
388388
# whilst also allowing for yaml to be specified too.
389389
{{- if eq "string" (printf "%T" .Values.extraVolumeMounts) }}
390-
{{ tpl .Values.extraVolumeMounts . | indent 10 }}
390+
{{ tpl .Values.extraVolumeMounts . | indent 8 }}
391391
{{- else }}
392-
{{ toYaml .Values.extraVolumeMounts | indent 10 }}
392+
{{ toYaml .Values.extraVolumeMounts | indent 8 }}
393393
{{- end }}
394394
{{- end }}
395395
{{- if .Values.masterTerminationFix }}

0 commit comments

Comments
 (0)