From 7f4bcb33b32e6252c2ce7fe8af9023c68ff7a30f Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Thu, 14 Oct 2021 01:48:11 +0800 Subject: [PATCH] Use the correct master configuration for majorVersion 1 (#69) * fix: use the correct master configuration for majorversion 1 Signed-off-by: Scott Leggett * chore: bump opensearch chart version Signed-off-by: Scott Leggett --- charts/opensearch/Chart.yaml | 2 +- charts/opensearch/templates/statefulset.yaml | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 793d6259..38373731 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: 1.0.6 +version: 1.0.7 # 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/templates/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml index 489444e9..5bf72a97 100644 --- a/charts/opensearch/templates/statefulset.yaml +++ b/charts/opensearch/templates/statefulset.yaml @@ -306,21 +306,11 @@ spec: fieldRef: fieldPath: metadata.name {{- if eq .Values.roles.master "true" }} - {{- if ge (int (include "opensearch.majorVersion" .)) 7 }} - name: cluster.initial_master_nodes value: "{{ template "opensearch.endpoints" . }}" - {{- else }} - - name: discovery.zen.minimum_master_nodes - value: "{{ .Values.minimumMasterNodes }}" - {{- end }} {{- end }} - {{- if lt (int (include "opensearch.majorVersion" .)) 7 }} - - name: discovery.zen.ping.unicast.hosts - value: "{{ template "opensearch.masterService" . }}-headless" - {{- else }} - name: discovery.seed_hosts value: "{{ template "opensearch.masterService" . }}-headless" - {{- end }} - name: cluster.name value: "{{ .Values.clusterName }}" - name: network.host