Skip to content

Commit

Permalink
Updated charts to follow the OpenSearch Project's inclusive language …
Browse files Browse the repository at this point in the history 
…standards

Signed-off-by: Phenix66 <[email protected]>
  • Loading branch information
@Phenix66
Phenix66 committed Jul 17, 2024
1 parent a018f83 commit c00e4e5
Show file tree
Hide file tree
Showing 13 changed files with 88 additions and 69 deletions.
10 changes: 5 additions & 5 deletions charts/data-prepper/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 11 additions & 1 deletion charts/opensearch-dashboards/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Security
---
## [2.20.0]
### Added
### Changed
- Updated OpenSearch language to follow the OpenSearch Project's inclusive language standards
### Deprecated
### Removed
### Fixed
### Security
---
## [2.19.0]
### Added
- Updated OpenSearch Dashboards appVersion to 2.15.0
Expand Down Expand Up @@ -340,7 +349,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.19.0...HEAD
[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
[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
Expand Down
2 changes: 1 addition & 1 deletion charts/opensearch-dashboards/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.0
version: 2.20.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
Expand Down
2 changes: 1 addition & 1 deletion charts/opensearch-dashboards/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 11 additions & 2 deletions charts/opensearch/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,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.0]
### Added
- Updated OpenSearch appVersion to 2.15.0
Expand Down Expand Up @@ -421,7 +430,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.21.0...HEAD
[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
[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
Expand Down Expand Up @@ -464,4 +474,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

2 changes: 1 addition & 1 deletion charts/opensearch/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
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
Expand Down
6 changes: 3 additions & 3 deletions charts/opensearch/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -64,14 +64,14 @@ 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` | `""` |
| `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` | `""` |
| `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` |
Expand Down
18 changes: 9 additions & 9 deletions charts/opensearch/ci/ci-ingress-class-name-values.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -381,7 +381,7 @@ ingress:
nameOverride: ""
fullnameOverride: ""

masterTerminationFix: false
clusterManagerTerminationFix: false

lifecycle: {}
# preStop:
Expand Down Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions charts/opensearch/ci/ci-rbac-enabled-values.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -381,7 +381,7 @@ ingress:
nameOverride: ""
fullnameOverride: ""

masterTerminationFix: false
clusterManagerTerminationFix: false

lifecycle: {}
# preStop:
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit c00e4e5

Please sign in to comment.