fixbugs

baseimg/tools/redis-k8s-ha/sentinel-service.yaml

 apiVersion: v1
 kind: Service
 metadata:
-  name: redis-sentinel
+  name: eos-redis-sentinel
   labels:
-    app: redis-sentinel
+    app: eos-redis-sentinel
 spec:
   clusterIP: None
   ports:
     - port: 26379
-      name: redis-sentinel
+      name: eos-redis-sentinel
   selector:
-    app: redis-sentinel
+    app: eos-redis-sentinel

baseimg/tools/redis-k8s-ha/sentinel.yaml

@@ -2,23 +2,25 @@
 apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
-  name: redis-sentinel
+  name: eos-redis-sentinel
+  tier: common
 spec:
-  serviceName: redis-sentinel
+  serviceName: eos-redis-sentinel
   replicas: 3
   template:
     metadata:
       labels:
-        app: redis-sentinel
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[{
-            "name": "k8s-redis-ha-sentinel",
-            "image": "tarosky/k8s-redis-ha:sentinel-3.0.1",
-            "volumeMounts": [{"name": "opt", "mountPath": "/opt"}]
-          }]'
+        app: eos-redis-sentinel
+		tier: common
     spec:
+      initContainers:
+        - name: k8s-redis-ha-server
+          image: tarosky/k8s-redis-ha:server-3.0.1
+          volumeMounts:
+            - name: opt
+              mountPath: /opt
       containers:
-        - name: redis-sentinel
+        - name: eos-redis-sentinel
           image: redis:3.2
           command:
             - /opt/bin/k8s-redis-ha-sentinel
@@ -38,7 +40,7 @@ spec:
           volumeMounts:
             - name: opt
               mountPath: /opt
-        - name: redis-sword
+        - name: eos-redis-sword
           image: tarosky/k8s-redis-ha:sword-3.0.1
           env:
             - name: SERVICE

baseimg/tools/redis-k8s-ha/server-service.yaml

 apiVersion: v1
 kind: Service
 metadata:
-  name: redis-server
+  name: eos-redis-server
   labels:
-    app: redis-server
+    app: eos-redis-server
 spec:
   clusterIP: None
   ports:
     - port: 6379
       name: redis-server
   selector:
-    app: redis-server
+    app: eos-redis-server

baseimg/tools/redis-k8s-ha/server.yaml

@@ -2,23 +2,25 @@
 apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
-  name: redis-server
+  name: eos-redis-server
+  tier: common
 spec:
-  serviceName: redis-server
+  serviceName: eos-redis-server
   replicas: 3
   template:
     metadata:
       labels:
-        app: redis-server
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[{
-            "name": "k8s-redis-ha-server",
-            "image": "tarosky/k8s-redis-ha:server-3.0.1",
-            "volumeMounts": [{"name": "opt", "mountPath": "/opt"}]
-          }]'
+        app: eos-redis-server
+		tier: common
     spec:
+      initContainers:
+        - name: eos-k8s-redis-ha-server
+          image: tarosky/k8s-redis-ha:server-3.0.1
+          volumeMounts:
+            - name: opt
+              mountPath: /opt
       containers:
-        - name: redis-server
+        - name: eos-redis-server
           image: redis:3.2
           command:
             - /opt/bin/k8s-redis-ha-server
@@ -40,12 +42,12 @@ spec:
             exec:
               command: ['redis-cli', 'info', 'server']
           volumeMounts:
-            - name: redis-server-volume
+            - name: eos-redis-server-volume
               mountPath: /data
             - name: opt
               mountPath: /opt
       volumes:
-        - name: redis-server-volume
+        - name: eos-redis-server-volume
           emptyDir: {}
         - name: opt
           emptyDir: {}