Set cluster name from environment.

cloud-gov · May 31, 2018 · cc5c5fc · cc5c5fc
1 parent ec6430c
commit cc5c5fc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/catalogData/elasticsearch56/medium-ha/k8s/statefulset-data.json b/catalogData/elasticsearch56/medium-ha/k8s/statefulset-data.json
@@ -104,6 +104,10 @@
               }
             ],
             "env": [
+              {
+                "name": "CLUSTER_NAME",
+                "value": "$service_id"
+              },
               {
                 "name": "DISCOVERY_SERVICE",
                 "value": "$idx_and_short_serviceid-master.default.svc.cluster.local"

diff --git a/catalogData/elasticsearch56/medium-ha/k8s/statefulset-master.json b/catalogData/elasticsearch56/medium-ha/k8s/statefulset-master.json
@@ -135,6 +135,10 @@
               }
             ],
             "env": [
+              {
+                "name": "CLUSTER_NAME",
+                "value": "$service_id"
+              },
               {
                 "name": "DISCOVERY_SERVICE",
                 "value": "$idx_and_short_serviceid-master.default.svc.cluster.local"

diff --git a/catalogData/elasticsearch56/medium/k8s/deployment.json b/catalogData/elasticsearch56/medium/k8s/deployment.json
@@ -115,6 +115,10 @@
               }
             ],
             "env": [
+              {
+                "name": "CLUSTER_NAME",
+                "value": "$service_id"
+              },
               {
                 "name": "DISCOVERY_SERVICE",
                 "value": "$idx_and_short_serviceid-master.default.svc.cluster.local"

diff --git a/custom_images/elasticsearch-56/elasticsearch.yml b/custom_images/elasticsearch-56/elasticsearch.yml
@@ -3,6 +3,9 @@ node:
   master: ${NODE_MASTER:true}
   name: ${HOSTNAME}
 
+cluster:
+  name: ${CLUSTER_NAME:elasticsearch}
+
 # see https://github.com/kubernetes/kubernetes/issues/3595
 bootstrap.memory_lock: ${BOOTSTRAP_MEMORY_LOCK:false}