Upgrade to 5.2.0. (fabric8io#71)

Upgrade Elasticsearch to versoin 5.2.0.
osman · Feb 1, 2017 · 0869c4b · 0869c4b
1 parent 1c39b7d
commit 0869c4b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The Kubernetes Cloud plugin allows to use Kubernetes API for the unicast discove
 Installation
 ============
 ```
-elasticsearch-plugin install io.fabric8:elasticsearch-cloud-kubernetes:5.1.2
+elasticsearch-plugin install io.fabric8:elasticsearch-cloud-kubernetes:5.2.0
 ```
 
 Versions available
@@ -147,7 +147,7 @@ items:
                     fieldPath: "metadata.namespace"
               - name: "NODE_MASTER"
                 value: "false"
-            image: "fabric8/elasticsearch-k8s:5.1.2"
+            image: "fabric8/elasticsearch-k8s:5.2.0"
             name: "elasticsearch"
             ports:
               - containerPort: 9300
@@ -189,7 +189,7 @@ items:
                     fieldPath: "metadata.namespace"
               - name: "NODE_DATA"
                 value: "false"
-            image: "fabric8/elasticsearch-k8s:5.1.2"
+            image: "fabric8/elasticsearch-k8s:5.2.0"
             name: "elasticsearch"
             ports:
               - containerPort: 9300
@@ -225,7 +225,7 @@ items:
                 value: "false"
               - name: "NODE_MASTER"
                 value: "false"
-            image: "fabric8/elasticsearch-k8s:5.1.2"
+            image: "fabric8/elasticsearch-k8s:5.2.0"
             name: "elasticsearch"
             ports:
               - containerPort: 9200

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.fabric8</groupId>
   <artifactId>elasticsearch-cloud-kubernetes</artifactId>
-  <version>5.1.2-SNAPSHOT</version>
+  <version>5.2.0-SNAPSHOT</version>
 
   <name>Elasticsearch Kubernetes cloud plugin</name>
   <description>The Kubernetes Cloud plugin allows to use Kubernetes for the unicast discovery mechanism.</description>
@@ -54,7 +54,7 @@
 
   <properties>
     <elasticsearch.plugin.name>discovery-kubernetes</elasticsearch.plugin.name>
-    <elasticsearch.version>5.1.2</elasticsearch.version>
+    <elasticsearch.version>5.2.0</elasticsearch.version>
     <kubernetes-client.version>1.4.27</kubernetes-client.version>
     <tests.shuffle>true</tests.shuffle>
     <tests.output>onerror</tests.output>

diff --git a/.../java/io/fabric8/elasticsearch/plugin/discovery/kubernetes/KubernetesDiscoveryPlugin.java b/.../java/io/fabric8/elasticsearch/plugin/discovery/kubernetes/KubernetesDiscoveryPlugin.java
@@ -24,6 +24,7 @@
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.network.NetworkService;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
@@ -66,10 +67,10 @@ public KubernetesDiscoveryPlugin(Settings settings) {
 
   @Override
   public Map<String, Supplier<Discovery>> getDiscoveryTypes(ThreadPool threadPool, TransportService transportService,
-                                                            ClusterService clusterService, UnicastHostsProvider hostsProvider) {
+                                                            NamedWriteableRegistry namedWriteableRegistry, ClusterService clusterService, UnicastHostsProvider hostsProvider) {
     // this is for backcompat with pre 5.1, where users would set discovery.type to use ec2 hosts provider
     return Collections.singletonMap(KUBERNETES, () ->
-      new ZenDiscovery(settings, threadPool, transportService, clusterService, hostsProvider));
+      new ZenDiscovery(settings, threadPool, transportService, namedWriteableRegistry, clusterService, hostsProvider));
   }
 
   @Override