Merge remote-tracking branch 'origin/main' into bugfix/inclusive-lang…

…uage
opensearch-project · Aug 21, 2024 · 768cbd6 · 768cbd6
2 parents c00e4e5 + 4ca8bfd
commit 768cbd6
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 12 deletions.
diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
-## [2.20.0]
+## [2.21.0]
 ### Added
 ### Changed
 - Updated OpenSearch language to follow the OpenSearch Project's inclusive language standards
@@ -22,6 +22,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
+## [2.20.0]
+### Added
+- Updated OpenSearch Dashboards appVersion to 2.16.0
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+---
+## [2.19.1]
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- Fixed pod topology spread constraints in Dashboards
+### Security
+---
 ## [2.19.0]
 ### Added
 - Updated OpenSearch Dashboards appVersion to 2.15.0
@@ -349,8 +367,10 @@ 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-dashboards-2.20.0...HEAD
-[2.19.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.19.0...opensearch-dashboards-2.20.0
+[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.21.0...HEAD
+[2.21.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.20.0...opensearch-dashboards-2.21.0
+[2.20.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.19.1...opensearch-dashboards-2.20.0
+[2.19.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.19.0...opensearch-dashboards-2.19.1
 [2.19.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.18.0...opensearch-dashboards-2.19.0
 [2.18.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.17.0...opensearch-dashboards-2.18.0
 [2.17.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.16.0...opensearch-dashboards-2.17.0

diff --git a/charts/opensearch-dashboards/Chart.yaml b/charts/opensearch-dashboards/Chart.yaml
@@ -15,13 +15,13 @@ 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: 2.20.0
+version: 2.21.0
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.15.0"
+appVersion: "2.16.0"
 
 maintainers:
   - name: DandyDeveloper

diff --git a/charts/opensearch-dashboards/templates/deployment.yaml b/charts/opensearch-dashboards/templates/deployment.yaml
@@ -79,7 +79,7 @@ spec:
     {{- end }}
     {{- if .Values.topologySpreadConstraints }}
       topologySpreadConstraints:
-{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+{{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
     {{- end }}
     {{- if .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
-## [2.22.0]
+## [2.23.0]
 ### Added
 ### Changed
 - Updated OpenSearch language to follow the OpenSearch Project's inclusive language standards
@@ -22,6 +22,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
+## [2.22.1]
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- Fixed opensearchJavaOpts defaults in README
+### Security
+---
+## [2.22.0]
+### Added
+- Updated OpenSearch appVersion to 2.16.0
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+---
 ## [2.21.0]
 ### Added
 - Updated OpenSearch appVersion to 2.15.0
@@ -430,8 +448,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 
 
-[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.22.0...HEAD
-[2.21.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.21.0...opensearch-2.22.0
+[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.23.0...HEAD
+[2.23.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.22.1...opensearch-2.23.0
+[2.22.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.22.0...opensearch-2.22.1
+[2.22.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.21.0...opensearch-2.22.0
 [2.21.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.20.0...opensearch-2.21.0
 [2.20.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.19.0...opensearch-2.20.0
 [2.19.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.18.0...opensearch-2.19.0

diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml
@@ -15,13 +15,13 @@ 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: 2.22.0
+version: 2.23.0
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.15.0"
+appVersion: "2.16.0"
 
 maintainers:
   - name: DandyDeveloper

diff --git a/charts/opensearch/README.md b/charts/opensearch/README.md
@@ -44,7 +44,7 @@ helm uninstall my-release
 | `enableServiceLinks`                | Set to false to disabling service links, which can cause slow pod startup times when there are many services in the current namespace.                                                                                                                                                                                                                                                                                                                                                                                             | `true`                                                                                                          |
 | `envFrom`                           | Templatable string to be passed to the [environment from variables][] which will be appended to the `envFrom:` definition for the container                                                                                                                                                                                                                                                                                                                                                                                        | `[]`                                                                                                            |
 | `config`                            | Allows you to add any config files in `/usr/share/opensearch/config/` such as `opensearch.yml` and `log4j2.properties`. String or map format may be used for specifying content of each configuration file. In case of string format, the whole content of the config file will be replaced by new config file value when in case of using map format content of configuration file will be a result of merge. In both cases content passed through tpl. See [values.yaml][] for an example of the formatting (passed through tpl) | `{}`                                                                                                            |
-| `opensearchJavaOpts`                | Java options for OpenSearch. This is where you should configure the jvm heap size                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `-Xmx1g -Xms1g`                                                                                                 |
+| `opensearchJavaOpts`                | Java options for OpenSearch. This is where you should configure the jvm heap size                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `-Xmx512M -Xms512M`                                                                                                 |
 | `majorVersion`                      | Used to set major version specific configuration. If you are using a custom image and not running the default OpenSearch version you will need to set this to the version you are running (e.g. `majorVersion: 1`)                                                                                                                                                                                                                                                                                                                 | `""`                                                                                                            |
 | `global.dockerRegistry`             | Set if you want to change the default docker registry, e.g. a private one.                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `""`                                                                                                            |
 | `extraContainers`                   | Array of extra containers                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `""`                                                                                                            |