update efk: es/kibana 6.6.1

blkart · May 6, 2019 · e851a9e · e851a9e
1 parent 5d47fb1
commit e851a9e
Show file tree

Hide file tree

Showing 6 changed files with 236 additions and 230 deletions.
diff --git a/manifests/efk/es-dynamic-pv/es-statefulset.yaml b/manifests/efk/es-dynamic-pv/es-statefulset.yaml
@@ -47,14 +47,14 @@ roleRef:
   apiGroup: ""
 ---
 # Elasticsearch deployment itself
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: elasticsearch-logging
   namespace: kube-system
   labels:
     k8s-app: elasticsearch-logging
-    version: v5.6.4
+    version: v6.6.1
     kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
@@ -63,18 +63,18 @@ spec:
   selector:
     matchLabels:
       k8s-app: elasticsearch-logging
-      version: v5.6.4
+      version: v6.6.1
   template:
     metadata:
       labels:
         k8s-app: elasticsearch-logging
-        version: v5.6.4
+        version: v6.6.1
         kubernetes.io/cluster-service: "true"
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
-      #- image: gcr.io/google-containers/elasticsearch:v5.6.4
-      - image: mirrorgooglecontainers/elasticsearch:v5.6.4
+      #- image: gcr.io/fluentd-elasticsearch/elasticsearch:v6.6.1
+      - image: easzlab/elasticsearch:v6.6.1
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class

diff --git a/manifests/efk/es-static-pv/es-statefulset.yaml b/manifests/efk/es-static-pv/es-statefulset.yaml
@@ -47,14 +47,14 @@ roleRef:
   apiGroup: ""
 ---
 # Elasticsearch deployment itself
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: elasticsearch-logging
   namespace: kube-system
   labels:
     k8s-app: elasticsearch-logging
-    version: v5.6.4
+    version: v6.6.1
     kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
@@ -63,18 +63,18 @@ spec:
   selector:
     matchLabels:
       k8s-app: elasticsearch-logging
-      version: v5.6.4
+      version: v6.6.1
   template:
     metadata:
       labels:
         k8s-app: elasticsearch-logging
-        version: v5.6.4
+        version: v6.6.1
         kubernetes.io/cluster-service: "true"
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
-      #- image: gcr.io/google-containers/elasticsearch:v5.6.4
-      - image: mirrorgooglecontainers/elasticsearch:v5.6.4
+      #- image: gcr.io/fluentd-elasticsearch/elasticsearch:v6.6.1
+      - image: easzlab/elasticsearch:v6.6.1
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class

diff --git a/manifests/efk/es-without-pv/es-statefulset.yaml b/manifests/efk/es-without-pv/es-statefulset.yaml
@@ -47,14 +47,14 @@ roleRef:
   apiGroup: ""
 ---
 # Elasticsearch deployment itself
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: elasticsearch-logging
   namespace: kube-system
   labels:
     k8s-app: elasticsearch-logging
-    version: v5.6.4
+    version: v6.6.1
     kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
@@ -63,18 +63,18 @@ spec:
   selector:
     matchLabels:
       k8s-app: elasticsearch-logging
-      version: v5.6.4
+      version: v6.6.1
   template:
     metadata:
       labels:
         k8s-app: elasticsearch-logging
-        version: v5.6.4
+        version: v6.6.1
         kubernetes.io/cluster-service: "true"
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
-      #- image: gcr.io/google-containers/elasticsearch:v5.6.4
-      - image: mirrorgooglecontainers/elasticsearch:v5.6.4
+      #- image: gcr.io/fluentd-elasticsearch/elasticsearch:v6.6.1
+      - image: easzlab/elasticsearch:v6.6.1
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class