Use the correct master configuration for majorVersion 1 (#69)

* fix: use the correct master configuration for majorversion 1 Signed-off-by: Scott Leggett <[email protected]> * chore: bump opensearch chart version Signed-off-by: Scott Leggett <[email protected]>
opensearch-project · Oct 13, 2021 · 7f4bcb3 · 7f4bcb3
1 parent 8aaa89e
commit 7f4bcb3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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