Updated charts to follow the OpenSearch Project's inclusive language standards

charts/data-prepper/CHANGELOG.md

@@ -7,4 +7,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Create initial version of data-prepper helm chart
-
+### Changed
+- Updated OpenSearch language to follow the OpenSearch Project's inclusive language standards

charts/data-prepper/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: 0.1.0
+version: 0.2.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

charts/data-prepper/values.yaml

@@ -131,7 +131,7 @@ pipelineConfig:
     #     bounded_blocking:
     #   sink:
     #     - opensearch:
-    #         hosts: ["https://opensearch-cluster-master:9200"]
+    #         hosts: ["https://opensearch-cluster-manager:9200"]
     #         username: "admin"
     #         password: "admin"
     #         insecure: true
@@ -180,13 +180,13 @@ pipelineConfig:
     #   processor:
     #     - otel_traces:
     #     - otel_trace_group:
-    #         hosts: [ "https://opensearch-cluster-master:9200" ]
+    #         hosts: [ "https://opensearch-cluster-manager:9200" ]
     #         insecure: true
     #         username: "admin"
     #         password: "admin"
     #   sink:
     #     - opensearch:
-    #         hosts: ["https://opensearch-cluster-master:9200"]
+    #         hosts: ["https://opensearch-cluster-manager:9200"]
     #         username: "admin"
     #         password: "admin"
     #         insecure: true
@@ -216,7 +216,7 @@ pipelineConfig:
     #         batch_size: 400
     #   sink:
     #     - opensearch:
-    #         hosts: ["https://opensearch-cluster-master:9200"]
+    #         hosts: ["https://opensearch-cluster-manager:9200"]
     #         username: "admin"
     #         password: "admin"
     #         insecure: true
@@ -243,7 +243,7 @@ pipelineConfig:
     #         flatten_attributes: false
     #   sink:
     #     - opensearch:
-    #         hosts: ["https://opensearch-cluster-master:9200"]
+    #         hosts: ["https://opensearch-cluster-manager:9200"]
     #         username: "admin"
     #         password: "admin"
     #         insecure: true

charts/opensearch-dashboards/CHANGELOG.md

@@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
+## [2.22.0]
+### Added
+### Changed
+- Updated OpenSearch language to follow the OpenSearch Project's inclusive language standards
+### Deprecated
+### Removed
+### Fixed
+### Security
+---
 ## [2.21.2]
 ### Added
 ### Changed
@@ -386,7 +395,8 @@ 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.21.2...HEAD
+[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.22.0...HEAD
+[2.21.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.21.2...opensearch-dashboards-2.22.0
 [2.21.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.21.1...opensearch-dashboards-2.21.2
 [2.21.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.21.0...opensearch-dashboards-2.21.1
 [2.21.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-2.20.0...opensearch-dashboards-2.21.0

charts/opensearch-dashboards/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.21.2
+version: 2.22.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

charts/opensearch-dashboards/values.yaml

@@ -5,7 +5,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-opensearchHosts: "https://opensearch-cluster-master:9200"
+opensearchHosts: "https://opensearch-cluster-manager:9200"
 replicaCount: 1
 
 image:

charts/opensearch/CHANGELOG.md

@@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
+## [2.24.0]
+### Added
+### Changed
+- Updated OpenSearch language to follow the OpenSearch Project's inclusive language standards
+### Deprecated
+### Removed
+### Fixed
+### Security
+---
 ## [2.23.2]
 ### Added
 - Metrics configuration in both `Service` templates
@@ -48,7 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 ### Removed
 ### Fixed
-- Fixed opensearchJavaOpts defaults in README 
+- Fixed opensearchJavaOpts defaults in README
 ### Security
 ---
 ## [2.22.0]
@@ -60,7 +69,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
-
 ## [2.21.0]
 ### Added
 - Updated OpenSearch appVersion to 2.15.0
@@ -469,7 +477,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.23.2...HEAD
+[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.24.0...HEAD
+[2.23.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.23.2...opensearch-2.24.0
 [2.23.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.23.1...opensearch-2.23.2
 [2.23.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.23.0...opensearch-2.23.1
 [2.23.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.22.1...opensearch-2.23.0
@@ -517,4 +526,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.2.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.1.0...opensearch-2.2.0
 [2.1.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.0.1...opensearch-2.1.0
 [2.0.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.0.0...opensearch-2.0.1
-

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.23.2
+version: 2.24.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

charts/opensearch/README.md

@@ -22,7 +22,7 @@ Once you've added this Helm repository as per the repository-level [README](../.
  helm install my-release opensearch/opensearch
  ```
 
-The command deploys OpenSearch with its associated components (data statefulsets, masters, clients) on the Kubernetes cluster in the default configuration.
+The command deploys OpenSearch with its associated components (data statefulsets, cluster managers, clients) on the Kubernetes cluster in the default configuration.
 
 **NOTE:** If using Helm 2 then you'll need to add the [`--name`](https://v2.helm.sh/docs/helm/#options-21) command line argument. If unspecified, Helm 2 will autogenerate a name for you.
 
@@ -40,6 +40,7 @@ helm uninstall my-release
 | :--- | :--- | :--- |
 | `antiAffinityTopologyKey` | The [anti-affinity][] topology key. By default this will prevent multiple Opensearch nodes from running on the same Kubernetes node | `kubernetes.io/hostname` |
 | `antiAffinity` | Setting this to `hard` enforces the [anti-affinity][] rules. If it is set to `soft` it will be done "best effort". Setting it to `custom` will use whatever is set in the `customAntiAffinity` parameter. Other values will be ignored. | `hard` |
+| `clusterManagerService` | The service name used to connect to the cluster managers. You only need to set this if your cluster manager `nodeGroup` is set to something other than `manager` | `""` |
 | `clusterName` | This will be used as the OpenSearch cluster name and should be unique per cluster in the namespace | `opensearch-cluster` |
 | `customAntiAffinity` | Allows passing in custom anti-affinity settings as defined in the [anti-affinity][] rules. Using this parameter requires setting the `antiAffinity` parameter to `custom`. | `{}` |
 | `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` |
@@ -65,14 +66,13 @@ helm uninstall my-release
 | `initResources` | Allows you to set the [resources][] for the `initContainer` in the StatefulSet | `{}` |
 | `keystore` | Allows you map Kubernetes secrets into the keystore. | `[]` |
 | `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` |
 | `nodeAffinity` | Value for the [node affinity settings][] | `{}` |
-| `nodeGroup` | This is the name that will be used for each group of nodes in the cluster. The name will be `clusterName-nodeGroup-X` , `nameOverride-nodeGroup-X` if a `nameOverride` is specified, and `fullnameOverride-X` if a `fullnameOverride` is specified | `master` |
+| `nodeGroup` | This is the name that will be used for each group of nodes in the cluster. The name will be `clusterName-nodeGroup-X` , `nameOverride-nodeGroup-X` if a `nameOverride` is specified, and `fullnameOverride-X` if a `fullnameOverride` is specified | `manager` |
 | `nodeSelector` | Configurable [nodeSelector][] so that you can target specific nodes for your OpenSearch cluster | `{}` |
 | `persistence` | Enables a persistent volume for OpenSearch data. | see [values.yaml][] |
 | `persistence.enableInitChown` | Disable the `fsgroup-volume` initContainer that will update permissions on the persistent disk. | `true` |

charts/opensearch/ci/ci-ingress-class-name-values.yaml

@@ -1,15 +1,15 @@
 ---
 clusterName: "opensearch-cluster"
-nodeGroup: "master"
+nodeGroup: "manager"
 
-# The service that non master groups will try to connect to when joining the cluster
-# This should be set to clusterName + "-" + nodeGroup for your master group
-masterService: "opensearch-cluster-master"
+# The service that non cluster manager groups will try to connect to when joining the cluster
+# This should be set to clusterName + "-" + nodeGroup for your cluster manager group
+clusterManagerService: "opensearch-cluster-manager"
 
 # OpenSearch roles that will be applied to this nodeGroup
-# These will be set as environment variable "node.roles". E.g. node.roles=master,ingest,data,remote_cluster_client
+# These will be set as environment variable "node.roles". E.g. node.roles=cluster_manager,ingest,data,remote_cluster_client
 roles:
-  - master
+  - cluster_manager
   - ingest
   - data
   - remote_cluster_client
@@ -381,7 +381,7 @@ ingress:
 nameOverride: ""
 fullnameOverride: ""
 
-masterTerminationFix: false
+clusterManagerTerminationFix: false
 
 lifecycle: {}
   # preStop:
@@ -410,9 +410,9 @@ networkPolicy:
   ## In order for a Pod to access OpenSearch, it needs to have the following label:
   ## {{ template "uname" . }}-client: "true"
   ## Example for default configuration to access HTTP port:
-  ## opensearch-master-http-client: "true"
+  ## opensearch-cluster-manager-http-client: "true"
   ## Example for default configuration to access transport port:
-  ## opensearch-master-transport-client: "true"
+  ## opensearch-cluster-manager-transport-client: "true"
 
   http:
     enabled: false

charts/opensearch/ci/ci-rbac-enabled-values.yaml

@@ -1,15 +1,15 @@
 ---
 clusterName: "opensearch-cluster"
-nodeGroup: "master"
+nodeGroup: "manager"
 
-# The service that non master groups will try to connect to when joining the cluster
-# This should be set to clusterName + "-" + nodeGroup for your master group
-masterService: "opensearch-cluster-master"
+# The service that non cluster manager groups will try to connect to when joining the cluster
+# This should be set to clusterName + "-" + nodeGroup for your cluster manager group
+clusterManagerService: "opensearch-cluster-manager"
 
 # OpenSearch roles that will be applied to this nodeGroup
-# These will be set as environment variable "node.roles". E.g. node.roles=master,ingest,data,remote_cluster_client
+# These will be set as environment variable "node.roles". E.g. node.roles=cluster_manager,ingest,data,remote_cluster_client
 roles:
-  - master
+  - cluster_manager
   - ingest
   - data
   - remote_cluster_client
@@ -381,7 +381,7 @@ ingress:
 nameOverride: ""
 fullnameOverride: ""
 
-masterTerminationFix: false
+clusterManagerTerminationFix: false
 
 lifecycle: {}
   # preStop:
@@ -410,9 +410,9 @@ networkPolicy:
   ## In order for a Pod to access OpenSearch, it needs to have the following label:
   ## {{ template "uname" . }}-client: "true"
   ## Example for default configuration to access HTTP port:
-  ## opensearch-master-http-client: "true"
+  ## opensearch-cluster-manager-http-client: "true"
   ## Example for default configuration to access transport port:
-  ## opensearch-master-transport-client: "true"
+  ## opensearch-cluster-manager-transport-client: "true"
 
   http:
     enabled: false

charts/opensearch/ci/ci-values.yaml

@@ -1,15 +1,15 @@
 ---
 clusterName: "opensearch-cluster"
-nodeGroup: "master"
+nodeGroup: "manager"
 
-# The service that non master groups will try to connect to when joining the cluster
-# This should be set to clusterName + "-" + nodeGroup for your master group
-masterService: "opensearch-cluster-master"
+# The service that non cluster manager groups will try to connect to when joining the cluster
+# This should be set to clusterName + "-" + nodeGroup for your cluster manager group
+clusterManagerService: "opensearch-cluster-manager"
 
 # OpenSearch roles that will be applied to this nodeGroup
-# These will be set as environment variable "node.roles". E.g. node.roles=master,ingest,data,remote_cluster_client
+# These will be set as environment variable "node.roles". E.g. node.roles=cluster_manager,ingest,data,remote_cluster_client
 roles:
-  - master
+  - cluster_manager
   - ingest
   - data
   - remote_cluster_client
@@ -367,7 +367,7 @@ ingress:
 nameOverride: ""
 fullnameOverride: ""
 
-masterTerminationFix: false
+clusterManagerTerminationFix: false
 
 lifecycle: {}
   # preStop:
@@ -396,9 +396,9 @@ networkPolicy:
   ## In order for a Pod to access OpenSearch, it needs to have the following label:
   ## {{ template "uname" . }}-client: "true"
   ## Example for default configuration to access HTTP port:
-  ## opensearch-master-http-client: "true"
+  ## opensearch-cluster-manager-http-client: "true"
   ## Example for default configuration to access transport port:
-  ## opensearch-master-transport-client: "true"
+  ## opensearch-cluster-manager-transport-client: "true"
 
   http:
     enabled: false

charts/opensearch/templates/_helpers.tpl

@@ -62,25 +62,25 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 {{- end -}}
 
-{{- define "opensearch.masterService" -}}
-{{- if empty .Values.masterService -}}
+{{- define "opensearch.clusterManagerService" -}}
+{{- if empty .Values.clusterManagerService -}}
 {{- if empty .Values.fullnameOverride -}}
 {{- if empty .Values.nameOverride -}}
-{{ .Values.clusterName }}-master
+{{ .Values.clusterName }}-manager
 {{- else -}}
-{{ .Values.nameOverride }}-master
+{{ .Values.nameOverride }}-manager
 {{- end -}}
 {{- else -}}
 {{ .Values.fullnameOverride }}
 {{- end -}}
 {{- else -}}
-{{ .Values.masterService }}
+{{ .Values.clusterManagerService }}
 {{- end -}}
 {{- end -}}
 
 {{- define "opensearch.serviceName" -}}
-{{- if eq .Values.nodeGroup "master" }}
-{{- include "opensearch.masterService" . }}
+{{- if or (eq .Values.nodeGroup "master") (eq .Values.nodeGroup "manager") }}
+{{- include "opensearch.clusterManagerService" . }}
 {{- else }}
 {{- include "opensearch.uname" . }}
 {{- end }}