diff --git a/charts/data-prepper/values.yaml b/charts/data-prepper/values.yaml index b63cf837..1bee5101 100644 --- a/charts/data-prepper/values.yaml +++ b/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 diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md index 7240ae9d..5da89633 100644 --- a/charts/opensearch-dashboards/CHANGELOG.md +++ b/charts/opensearch-dashboards/CHANGELOG.md @@ -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 diff --git a/charts/opensearch-dashboards/Chart.yaml b/charts/opensearch-dashboards/Chart.yaml index 06b173ff..140a8b61 100644 --- a/charts/opensearch-dashboards/Chart.yaml +++ b/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.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 diff --git a/charts/opensearch-dashboards/values.yaml b/charts/opensearch-dashboards/values.yaml index 40fece82..d55e3343 100644 --- a/charts/opensearch-dashboards/values.yaml +++ b/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: diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index d206b2ed..b4d1337c 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.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 @@ -464,4 +473,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 - diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 7fbbcc8d..0d7f8ddb 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.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 diff --git a/charts/opensearch/README.md b/charts/opensearch/README.md index 7991d37a..e68aa86e 100644 --- a/charts/opensearch/README.md +++ b/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. @@ -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` | diff --git a/charts/opensearch/ci/ci-ingress-class-name-values.yaml b/charts/opensearch/ci/ci-ingress-class-name-values.yaml index c02e2756..e58d6faa 100644 --- a/charts/opensearch/ci/ci-ingress-class-name-values.yaml +++ b/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 diff --git a/charts/opensearch/ci/ci-rbac-enabled-values.yaml b/charts/opensearch/ci/ci-rbac-enabled-values.yaml index b2463d55..5f3f02d3 100755 --- a/charts/opensearch/ci/ci-rbac-enabled-values.yaml +++ b/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 diff --git a/charts/opensearch/ci/ci-values.yaml b/charts/opensearch/ci/ci-values.yaml index fbd24cc8..0a3c4ad8 100755 --- a/charts/opensearch/ci/ci-values.yaml +++ b/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 diff --git a/charts/opensearch/templates/_helpers.tpl b/charts/opensearch/templates/_helpers.tpl index f7dc47d0..90b13422 100755 --- a/charts/opensearch/templates/_helpers.tpl +++ b/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 }} diff --git a/charts/opensearch/templates/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml index 72e14976..91ee1d30 100644 --- a/charts/opensearch/templates/statefulset.yaml +++ b/charts/opensearch/templates/statefulset.yaml @@ -399,12 +399,12 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name - {{- if (and (has "master" .Values.roles) (not .Values.singleNode)) }} - - name: cluster.initial_master_nodes + {{- if (and (or (has "master" .Values.roles) (has "cluster_manager" .Values.roles)) (not .Values.singleNode)) }} + - name: cluster.initial_cluster_manager_nodes value: "{{ template "opensearch.endpoints" . }}" {{- end }} - name: discovery.seed_hosts - value: "{{ template "opensearch.masterService" . }}-headless" + value: "{{ template "opensearch.clusterManagerService" . }}-headless" - name: cluster.name value: "{{ .Values.clusterName }}" - name: network.host @@ -507,10 +507,10 @@ spec: {{ toYaml .Values.extraVolumeMounts | indent 8 }} {{- end }} {{- end }} - {{- if .Values.masterTerminationFix }} - {{- if has "master" .Values.roles }} - # This sidecar will prevent slow master re-election - - name: opensearch-master-graceful-termination-handler + {{- if .Values.clusterManagerTerminationFix }} + {{- if or (has "master" .Values.roles) (has "cluster_manager" .Values.roles) }} + # This sidecar will prevent slow cluster-manager re-election + - name: opensearch-cluster-manager-graceful-termination-handler image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: "{{ .Values.image.pullPolicy }}" command: @@ -527,17 +527,17 @@ spec: else BASIC_AUTH='' fi - curl -XGET -s -k --fail ${BASIC_AUTH} {{ .Values.protocol }}://{{ template "opensearch.masterService" . }}:{{ .Values.httpPort }}${path} + curl -XGET -s -k --fail ${BASIC_AUTH} {{ .Values.protocol }}://{{ template "opensearch.clusterManagerService" . }}:{{ .Values.httpPort }}${path} } cleanup () { while true ; do - local master="$(http "/_cat/master?h=node" || echo "")" - if [[ $master == "{{ template "opensearch.masterService" . }}"* && $master != "${NODE_NAME}" ]]; then - echo "This node is not master." + local cluster_manager="$(http "/_cat/cluster_manager?h=node" || echo "")" + if [[ $cluster_manager == "{{ template "opensearch.clusterManagerService" . }}"* && $cluster_manager != "${NODE_NAME}" ]]; then + echo "This node is not cluster-manager." break fi - echo "This node is still master, waiting gracefully for it to step down" + echo "This node is still cluster-manager, waiting gracefully for it to step down" sleep 1 done diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index 33737661..d9b4d169 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -1,20 +1,20 @@ --- clusterName: "opensearch-cluster" -nodeGroup: "master" +nodeGroup: "manager" # If discovery.type in the opensearch configuration is set to "single-node", # this should be set to "true" # If "true", replicas will be forced to 1 singleNode: false -# 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 @@ -419,7 +419,7 @@ ingress: nameOverride: "" fullnameOverride: "" -masterTerminationFix: false +clusterManagerTerminationFix: false opensearchLifecycle: {} # preStop: @@ -459,9 +459,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