updated value.yaml and related files. Also update image for the container

Author: renmak

elasticsearch/templates/deployment-es-client.yaml

@@ -17,14 +17,14 @@ kind: Deployment
 metadata:
   name: {{ .Values.labels.es_client.name }}
   labels:
-    component: {{ .Values.labels.es_client.component }}
+    component: {{ .Values.labels.common.component }}
     role: {{ .Values.labels.es_client.role }}
 spec:
   replicas: {{ .Values.replicas.es_client }}
   template:
     metadata:
       labels:
-        component: {{ .Values.labels.es_client.component }}
+        component: {{ .Values.labels.common.component }}
         role: {{ .Values.labels.es_client.role }}
       annotations:
         # Elasticsearch uses a hybrid mmapfs / niofs directory by default to
@@ -82,12 +82,12 @@ spec:
         - name: "ES_JAVA_OPTS"
           value: {{ .Values.es_java_opts.es_client }}
         ports:
-        - containerPort: {{ .Values.network.ports.http }}
-          name: http
-          protocol: TCP
-        - containerPort: {{ .Values.network.ports.elasticsearch }} 
-          name: transport
-          protocol: TCP
+        - containerPort: {{ .Values.network.client.port }}
+          name: {{ .Values.network.client.name }}
+          protocol: {{ .Values.network.client.protocol }}
+        - containerPort: {{ .Values.network.discovery.port}} 
+          name: {{ .Values.network.discovery.name }}
+          protocol: {{ .Values.network.discovery.protocol }}
         volumeMounts:
         - name: storage
           mountPath: /data

elasticsearch/templates/deployment-es-data.yaml

@@ -17,14 +17,14 @@ kind: Deployment
 metadata:
   name: {{ .Values.labels.es_data.name }}
   labels:
-    component: {{ .Values.labels.es_data.component }}
+    component: {{ .Values.labels.common.component }}
     role: {{ .Values.labels.es_data.role }}
 spec:
   replicas: {{ .Values.replicas.es_data }}
   template:
     metadata:
       labels:
-        component: {{ .Values.labels.es_data.component }}
+        component: {{ .Values.labels.common.component }}
         role: {{ .Values.labels.es_data.role }}
       annotations:
         pod.beta.kubernetes.io/init-containers: '[
@@ -78,9 +78,9 @@ spec:
         - name: "ES_JAVA_OPTS"
           value: {{ .Values.es_java_opts.es_data }}
         ports:
-        - containerPort: {{ .Values.network.ports.elasticsearch }} 
-          name: transport
-          protocol: TCP
+        - containerPort: {{ .Values.network.discovery.port}} 
+          name: {{ .Values.network.discovery.name}} 
+          protocol: {{ .Values.network.discovery.protocol}} 
         volumeMounts:
         - name: storage
           mountPath: /data

elasticsearch/templates/deployment-es-master.yaml

@@ -17,14 +17,14 @@ kind: Deployment
 metadata:
   name: {{ .Values.labels.es_master.name }}
   labels:
-    component: {{ .Values.labels.es_master.component }}
+    component: {{ .Values.labels.common.component }}
     role: {{ .Values.labels.es_master.role }}
 spec:
   replicas: {{ .Values.replicas.es_master }}
   template:
     metadata:
       labels:
-        component: {{ .Values.labels.es_master.component }}
+        component: {{ .Values.labels.common.component }}
         role: {{ .Values.labels.es_master.role }}
       annotations:
         pod.beta.kubernetes.io/init-containers: '[
@@ -82,9 +82,9 @@ spec:
         - name: "ES_JAVA_OPTS"
           value: {{ .Values.es_java_opts.es_master }}
         ports:
-        - containerPort: {{ .Values.network.ports.elasticsearch }} 
-          name: transport
-          protocol: TCP
+        - containerPort: {{ .Values.network.discovery.port }} 
+          name: {{ .Values.network.discovery.name }} 
+          protocol: {{ .Values.network.discovery.protocol }} 
         volumeMounts:
         - name: storage
           mountPath: /data

elasticsearch/templates/service-es-client.yaml

@@ -15,17 +15,17 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.labels.es_client.service_name }}
+  name: {{ .Values.services.client.name }}
   labels:
-    component: {{ .Values.labels.es_client.component }}
+    component: {{ .Values.labels.common.component }}
     role: {{ .Values.labels.es_client.role }}
 spec:
-  type: {{ .Values.labels.es_client.service_type }}
+  type: {{ .Values.services.client.type }}
   selector: 
-    component: {{ .Values.labels.es_client.component }}
+    component: {{ .Values.labels.common.component }}
     role: {{ .Values.labels.es_client.role }}
   ports:
-  - name: http
-    port: {{ .Values.network.ports.http }}
-    protocol: TCP
+  - name: {{ .Values.network.client.name }}
+    port: {{ .Values.network.client.port }}
+    protocol: {{ .Values.network.client.protocol }}
 

elasticsearch/templates/service-es-discovery.yaml

@@ -15,15 +15,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.labels.es_master.service_name }}
+  name: {{ .Values.services.discovery.name }}
   labels:
-    component: {{ .Values.labels.es_master.component }}
+    component: {{ .Values.labels.common.component }}
     role: {{ .Values.labels.es_master.role }}
 spec:
   selector:
-    component: {{ .Values.labels.es_master.component }}
+    component: {{ .Values.labels.common.component }}
     role: {{ .Values.labels.es_master.role }}
   ports:
-  - name: transport
-    port: {{ .Values.network.ports.elasticsearch }} 
-    protocol: TCP
+  - name: {{ .Values.network.discovery.name }} 
+    port: {{ .Values.network.discovery.port }} 
+    protocol: {{ .Values.network.discovery.protocol }} 

elasticsearch/values.yaml

@@ -24,39 +24,46 @@ replicas:
 cluster_name: myesdb
 
 images:
-  elasticsearch: quay.io/pires/docker-elasticsearch-kubernetes:5.4.0
+  elasticsearch: gcr.io/google_containers/elasticsearch:v2.4.1-2
   pullPolicy: Always
 
 labels:
-  es_master:
+  common:
     component: elasticsearch
+  es_master:
     role: master
     name: es-master
-    service_name: elasticsearch-discovery
   es_data:
-    component: elasticsearch
     role: data
     name: es-data
-    service_name: es-data
   es_client:
-    component: elasticsearch
     role: client
     name: es-client
-    service_name: elasticsearch-logging
-    service_type: LoadBalancer
-
-network:
-  ports:
-    http: 9200 # for es-client
-    elasticsearch: 9300 # for elasticsearch compoenent 
 
 #heap size via JVM flags
 es_java_opts: 
   es_master: "-Xms256m -Xmx256m"
   es_data: "-Xms256m -Xmx256m"
   es_client: "-Xms256m -Xmx256m"
 
-#
+services:
+  client:
+    name: elasticsearch-logging
+    type: LoadBalancer
+  discovery:
+    name: elasticsearch-discovery
+  
+network:
+  client:
+    name: http
+    port: 9200
+    protocol: TCP
+  discovery:
+    name: transport
+    port: 9300
+    protocol: TCP
+    
+
 resources:
   enabled: false
   limits: