Change yaml descriptors for recommended node layout

tainnsre · Jun 14, 2018 · e318513 · e318513
1 parent 118d237
commit e318513
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 6 deletions.
diff --git a/es-data.yaml b/es-data.yaml
@@ -52,13 +52,21 @@ spec:
           limits:
             cpu: 1
         ports:
+        - containerPort: 9200
+          name: http
         - containerPort: 9300
           name: transport
         livenessProbe:
           tcpSocket:
             port: transport
           initialDelaySeconds: 20
           periodSeconds: 10
+        readinessProbe:
+          httpGet:
+            path: /_cluster/health
+            port: http
+          initialDelaySeconds: 20
+          timeoutSeconds: 5
         volumeMounts:
         - name: storage
           mountPath: /data

diff --git a/es-ingest-svc.yaml b/es-ingest-svc.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: elasticsearch-ingest
+  labels:
+    component: elasticsearch
+    role: ingest
+spec:
+  selector:
+    component: elasticsearch
+    role: ingest
+  ports:
+  - name: http
+    port: 9200
+#type: LoadBalancer
diff --git a/es-client.yaml → es-ingest.yaml b/es-client.yaml → es-ingest.yaml
@@ -1,17 +1,17 @@
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
-  name: es-client
+  name: es-ingest
   labels:
     component: elasticsearch
-    role: client
+    role: ingest
 spec:
   replicas: 2
   template:
     metadata:
       labels:
         component: elasticsearch
-        role: client
+        role: ingest
     spec:
       initContainers:
       - name: init-sysctl
@@ -23,7 +23,7 @@ spec:
         securityContext:
           privileged: true
       containers:
-      - name: es-client
+      - name: es-ingest
         image: quay.io/pires/docker-elasticsearch-kubernetes:6.2.4
         env:
         - name: NAMESPACE

diff --git a/es-svc.yaml b/es-svc.yaml
@@ -4,11 +4,11 @@ metadata:
   name: elasticsearch
   labels:
     component: elasticsearch
-    role: client
+    role: data
 spec:
   selector:
     component: elasticsearch
-    role: client
+    role: data
   ports:
   - name: http
     port: 9200

diff --git a/stateful/es-data-stateful.yaml b/stateful/es-data-stateful.yaml
@@ -53,13 +53,21 @@ spec:
           limits:
             cpu: 1
         ports:
+        - containerPort: 9200
+          name: http
         - containerPort: 9300
           name: transport
         livenessProbe:
           tcpSocket:
             port: transport
           initialDelaySeconds: 20
           periodSeconds: 10
+        readinessProbe:
+          httpGet:
+            path: /_cluster/health
+            port: http
+          initialDelaySeconds: 20
+          timeoutSeconds: 5
         volumeMounts:
         - name: storage
           mountPath: /data