Service port for performance analyzer (#346)

* Performance analyzer port mapping Signed-off-by: Philipp Hölscher <[email protected]> * Performance analyzer port on ci-values Signed-off-by: Philipp Hölscher <[email protected]> * Update changelog Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Philipp Hölscher <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Co-authored-by: Peter Zhu <[email protected]>
opensearch-project · Mar 22, 2023 · 69daf97 · 69daf97
1 parent 3301ee8
commit 69daf97
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 3 deletions.
diff --git 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.11.2]
+### Added
+- Service ports for performance analyzer
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+---
 ## [2.11.1]
 ### Added
 - Support for lifecycle in the opensearch container in the StatefulSet
@@ -204,7 +213,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.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
 [2.9.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.9.0...opensearch-2.9.1

diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml
@@ -15,8 +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.11.1
-
+version: 2.11.2
 
 # 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
@@ -65,6 +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 (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`
@@ -95,6 +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 (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`                                     |

diff --git 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
@@ -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
@@ -253,6 +253,7 @@ enableServiceLinks: true
 protocol: https
 httpPort: 9200
 transportPort: 9300
+metricsPort: 9600
 
 service:
   labels: {}

diff --git 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
@@ -347,6 +347,8 @@ spec:
           {{- if .Values.transportHostPort }}
           hostPort: {{ .Values.transportHostPort }}
           {{- end }}
+        - name: metrics
+          containerPort: {{ .Values.metricsPort }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         env:

diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml
@@ -259,9 +259,11 @@ enableServiceLinks: true
 protocol: https
 httpPort: 9200
 transportPort: 9300
+metricsPort: 9600
 httpHostPort: ""
 transportHostPort: ""
 
+
 service:
   labels: {}
   labelsHeadless: {}
@@ -272,6 +274,7 @@ service:
   annotations: {}
   httpPortName: http
   transportPortName: transport
+  metricsPortName: metrics
   loadBalancerIP: ""
   loadBalancerSourceRanges: []
   externalTrafficPolicy: ""