create specific headless service for elasticsearch

uselagoon · Mar 11, 2019 · 41164bb · 41164bb
1 parent dc07d6e
commit 41164bb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/images/elasticsearch/configure-es.sh b/images/elasticsearch/configure-es.sh
@@ -21,10 +21,6 @@ function join {
     local IFS="$1"; shift; echo "$*";
 }
 
-HOSTNAME=$(hostname)
-# Parse out cluster name, from service name:
-CLUSTER_NAME="$(hostname -f | cut -d'.' -f2)"
-
 while read -ra LINE; do
     if [[ "${LINE}" == *"${HOSTNAME}"* ]]; then
         MY_NAME=$LINE

diff --git a/images/elasticsearch/docker-entrypoint.sh b/images/elasticsearch/docker-entrypoint.sh
@@ -9,7 +9,7 @@ else
   # Is running in Kubernetes/OpenShift, so find all other pods
   # belonging to the namespace
   echo "Elasticsearch: Finding peers"
-  K8S_SVC_NAME=$(hostname -f | cut -d"." -f2)
+  K8S_SVC_NAME=$SERVICE_NAME-headless
   echo "Using service name: ${K8S_SVC_NAME}"
   # copy the pristine version to the one that can be edited
   /usr/bin/peer-finder -on-start="/lagoon/configure-es.sh" -service=${K8S_SVC_NAME}

diff --git a/images/oc-build-deploy-dind/openshift-templates/elasticsearch-cluster/services.yml b/images/oc-build-deploy-dind/openshift-templates/elasticsearch-cluster/services.yml
@@ -42,7 +42,7 @@ objects:
       service: ${SERVICE_NAME}
       branch: ${SAFE_BRANCH}
       project: ${SAFE_PROJECT}
-    name: ${SERVICE_NAME}
+    name: ${SERVICE_NAME}-headless
   spec:
     clusterIP: None
     ports:
@@ -65,7 +65,7 @@ objects:
       service: ${SERVICE_NAME}
       branch: ${SAFE_BRANCH}
       project: ${SAFE_PROJECT}
-    name: ${SERVICE_NAME}-service
+    name: ${SERVICE_NAME}
   spec:
     ports:
     - name: 9200-tcp