From eb2a6d5f4531300f1e15aec31d2085cc8f677eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6lscher?= <46397932+Phoelsch@users.noreply.github.com> Date: Wed, 22 Mar 2023 20:37:23 +0100 Subject: [PATCH] Service port for performance analyzer (#346) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Performance analyzer port mapping Signed-off-by: Philipp Hölscher * Performance analyzer port on ci-values Signed-off-by: Philipp Hölscher * Update changelog Signed-off-by: Peter Zhu --------- Signed-off-by: Philipp Hölscher Signed-off-by: Peter Zhu Co-authored-by: Peter Zhu Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> --- charts/opensearch/CHANGELOG.md | 3 ++- charts/opensearch/README.md | 2 ++ 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 + charts/opensearch/templates/service.yaml | 2 ++ charts/opensearch/templates/statefulset.yaml | 2 ++ charts/opensearch/values.yaml | 3 +++ 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index dbb73add..85a2f694 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -213,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/README.md b/charts/opensearch/README.md index 241257b0..e3f0da0b 100644 --- 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 index 2223f5bf..13ee25a2 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 42ec6231..01892e38 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 c63eab66..9b0308bd 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: {} 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 32f357c0..a941c542 100644 --- a/charts/opensearch/templates/statefulset.yaml +++ b/charts/opensearch/templates/statefulset.yaml @@ -350,6 +350,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 index c58f4a05..0274c798 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -262,9 +262,11 @@ enableServiceLinks: true protocol: https httpPort: 9200 transportPort: 9300 +metricsPort: 9600 httpHostPort: "" transportHostPort: "" + service: labels: {} labelsHeadless: {} @@ -275,6 +277,7 @@ service: annotations: {} httpPortName: http transportPortName: transport + metricsPortName: metrics loadBalancerIP: "" loadBalancerSourceRanges: [] externalTrafficPolicy: ""