From 3b5db414a444661142994dce9853a80b69e2832c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6lscher?= Date: Thu, 3 Nov 2022 21:45:56 +0100 Subject: [PATCH 1/3] Performance analyzer port mapping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Hölscher --- charts/opensearch/CHANGELOG.md | 9 +++++++++ charts/opensearch/Chart.yaml | 2 +- charts/opensearch/README.md | 2 ++ charts/opensearch/templates/service.yaml | 2 ++ charts/opensearch/templates/statefulset.yaml | 2 ++ charts/opensearch/values.yaml | 2 ++ 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 8c9f0f55..6d87802a 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security --- +## [2.6.3] +### Added +- Service ports for performance analyzer +### Changed +### Deprecated +### Removed +### Fixed +### Security +--- ## [2.6.2] ### Added - Liveness probe for statefulset diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 5f2c0bc4..97546a78 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: 2.6.2 +version: 2.6.3 # 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/README.md b/charts/opensearch/README.md index 8b89ba6e..8050ac91 100644 --- a/charts/opensearch/README.md +++ b/charts/opensearch/README.md @@ -63,6 +63,7 @@ helm uninstall my-release | `labels` | Configurable [labels][] applied to all OpenSearch pods | `{}` | | `masterService` | The service name used to connect to the masters. You only need to set this if your master `nodeGroup` is set to something other than `master` | `""` | | `maxUnavailable` | The [maxUnavailable][] value for the pod disruption budget. By default this will prevent Kubernetes from having more than 1 unhealthy pod in the node group | `1` | +| `metricsPort` | The metrics port that Kubernetes will use for the service. | `9600` | | `nameOverride` | Overrides the `clusterName` when used in the naming of resources | `""` | | `networkHost` | Value for the `network.host OpenSearch setting` | `0.0.0.0` | | `networkPolicy.create` | Enable network policy creation for OpenSearch | `false` @@ -93,6 +94,7 @@ helm uninstall my-release | `service.labels` | Labels to be added to non-headless service | `{}` | | `service.loadBalancerIP` | Some cloud providers allow you to specify the [loadBalancer][] IP. If the `loadBalancerIP` field is not specified, the IP is dynamically assigned. If you specify a `loadBalancerIP` but your cloud provider does not support the feature, it is ignored. | `""` | | `service.loadBalancerSourceRanges` | The IP ranges that are allowed to access | `[]` | +| `service.metricsPortName` | The name of the metrics port within the service | `metrics` | | `service.nodePort` | Custom [nodePort][] port that can be set if you are using `service.type: nodePort` | `""` | | `service.transportPortName` | The name of the transport port within the service | `transport` | | `service.type` | OpenSearch [Service Types][] | `ClusterIP` | diff --git a/charts/opensearch/templates/service.yaml b/charts/opensearch/templates/service.yaml index 3b74924f..1ab46b86 100644 --- a/charts/opensearch/templates/service.yaml +++ b/charts/opensearch/templates/service.yaml @@ -60,3 +60,5 @@ spec: port: {{ .Values.httpPort }} - name: {{ .Values.service.transportPortName | default "transport" }} port: {{ .Values.transportPort }} + - name: {{ .Values.service.metricsPortName | default "metrics" }} + port: {{ .Values.metricsPort }} diff --git a/charts/opensearch/templates/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml index 91e17329..67f22276 100644 --- a/charts/opensearch/templates/statefulset.yaml +++ b/charts/opensearch/templates/statefulset.yaml @@ -321,6 +321,8 @@ spec: containerPort: {{ .Values.httpPort }} - name: transport containerPort: {{ .Values.transportPort }} + - name: metrics + containerPort: {{ .Values.metricsPort }} resources: {{ toYaml .Values.resources | indent 10 }} env: diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index eb5a7ea9..f82a7e17 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -259,6 +259,7 @@ enableServiceLinks: true protocol: https httpPort: 9200 transportPort: 9300 +metricsPort: 9600 service: labels: {} @@ -270,6 +271,7 @@ service: annotations: {} httpPortName: http transportPortName: transport + metricsPortName: metrics loadBalancerIP: "" loadBalancerSourceRanges: [] externalTrafficPolicy: "" From 656df3ea79ee019d9925c57f77ef070c173737aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6lscher?= Date: Mon, 7 Nov 2022 13:46:19 +0100 Subject: [PATCH 2/3] Performance analyzer port on ci-values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Hölscher --- charts/opensearch/CHANGELOG.md | 3 ++- charts/opensearch/ci/ci-ingress-class-name-values.yaml | 1 + charts/opensearch/ci/ci-rbac-enabled-values.yaml | 1 + charts/opensearch/ci/ci-values.yaml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 6d87802a..3a502420 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -131,7 +131,8 @@ 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.6.2...HEAD +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.6.3...HEAD +[2.6.3]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.6.2...opensearch-2.6.3 [2.6.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.6.1...opensearch-2.6.2 [2.6.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.6.0...opensearch-2.6.1 [2.6.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.5.0...opensearch-2.6.0 diff --git a/charts/opensearch/ci/ci-ingress-class-name-values.yaml b/charts/opensearch/ci/ci-ingress-class-name-values.yaml index fc41b812..1b554c1f 100644 --- a/charts/opensearch/ci/ci-ingress-class-name-values.yaml +++ b/charts/opensearch/ci/ci-ingress-class-name-values.yaml @@ -251,6 +251,7 @@ enableServiceLinks: true protocol: https httpPort: 9200 transportPort: 9300 +metricsPort: 9600 service: labels: {} diff --git a/charts/opensearch/ci/ci-rbac-enabled-values.yaml b/charts/opensearch/ci/ci-rbac-enabled-values.yaml index 57b1acd9..b15830ee 100755 --- a/charts/opensearch/ci/ci-rbac-enabled-values.yaml +++ b/charts/opensearch/ci/ci-rbac-enabled-values.yaml @@ -251,6 +251,7 @@ enableServiceLinks: true protocol: https httpPort: 9200 transportPort: 9300 +metricsPort: 9600 service: labels: {} diff --git a/charts/opensearch/ci/ci-values.yaml b/charts/opensearch/ci/ci-values.yaml index 86758b0c..358efe00 100755 --- a/charts/opensearch/ci/ci-values.yaml +++ b/charts/opensearch/ci/ci-values.yaml @@ -253,6 +253,7 @@ enableServiceLinks: true protocol: https httpPort: 9200 transportPort: 9300 +metricsPort: 9600 service: labels: {} From 7f115a2e9c0617c759775eaa5d616c13dd4c421a Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 22 Mar 2023 14:49:15 -0400 Subject: [PATCH 3/3] Update changelog Signed-off-by: Peter Zhu --- charts/opensearch/CHANGELOG.md | 3 +-- charts/opensearch/README.md | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 894accfe..cec50f8e 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -213,8 +213,7 @@ 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.11.0...HEAD +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.11.1...HEAD [2.11.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.11.0...opensearch-2.11.1 [2.11.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.10.0...opensearch-2.11.0 [2.10.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.9.1...opensearch-2.10.0 diff --git a/charts/opensearch/README.md b/charts/opensearch/README.md index 27f617db..e3f0da0b 100644 --- a/charts/opensearch/README.md +++ b/charts/opensearch/README.md @@ -65,7 +65,7 @@ helm uninstall my-release | `labels` | Configurable [labels][] applied to all OpenSearch pods | `{}` | | `masterService` | The service name used to connect to the masters. You only need to set this if your master `nodeGroup` is set to something other than `master` | `""` | | `maxUnavailable` | The [maxUnavailable][] value for the pod disruption budget. By default this will prevent Kubernetes from having more than 1 unhealthy pod in the node group | `1` | -| `metricsPort` | The metrics port that Kubernetes will use for the service. | `9600` | +| `metricsPort` | The metrics port (for Performance Analyzer) that Kubernetes will use for the service. | `9600` | | `nameOverride` | Overrides the `clusterName` when used in the naming of resources | `""` | | `networkHost` | Value for the `network.host OpenSearch setting` | `0.0.0.0` | | `networkPolicy.create` | Enable network policy creation for OpenSearch | `false` @@ -96,7 +96,7 @@ helm uninstall my-release | `service.labels` | Labels to be added to non-headless service | `{}` | | `service.loadBalancerIP` | Some cloud providers allow you to specify the [loadBalancer][] IP. If the `loadBalancerIP` field is not specified, the IP is dynamically assigned. If you specify a `loadBalancerIP` but your cloud provider does not support the feature, it is ignored. | `""` | | `service.loadBalancerSourceRanges` | The IP ranges that are allowed to access | `[]` | -| `service.metricsPortName` | The name of the metrics port within the service | `metrics` | +| `service.metricsPortName` | The name of the metrics port (for Performance Analyzer) within the service | `metrics` | | `service.nodePort` | Custom [nodePort][] port that can be set if you are using `service.type: nodePort` | `""` | | `service.transportPortName` | The name of the transport port within the service | `transport` | | `service.type` | OpenSearch [Service Types][] | `ClusterIP` |