Merge branch 'release/1.6.0'

netifi-proteus · Apr 4, 2019 · e24268e · e24268e
2 parents 877b26d + a553b65
commit e24268e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ot-autoconfigure/src/main/java/io/netifi/proteus/springboot/ProteusAutoConfiguration.java b/...ot-autoconfigure/src/main/java/io/netifi/proteus/springboot/ProteusAutoConfiguration.java
@@ -111,13 +111,13 @@ public io.netifi.proteus.springboot.support.ProteusConfigurer propertiesBasedPro
                         connectionType = ec2Properties.getConnectionType();
                         break;
                     case "consul":
-                        ConsulProperties consulProperties = new ConsulProperties();
+                        ConsulProperties consulProperties = discovery.getConsulProperties();
                         ConsulDiscoveryConfig consulDiscoveryConfig = new ConsulDiscoveryConfig( consulProperties.getConsulURL(), consulProperties.getServiceName());
                         discoveryStrategy = DiscoveryStrategy.getInstance(consulDiscoveryConfig);
                         connectionType = consulProperties.getConnectionType();
                         break;
                     case "kubernetes":
-                        KubernetesProperties kubernetesProperties = new KubernetesProperties();
+                        KubernetesProperties kubernetesProperties = discovery.getKubernetesProperties();
                         KubernetesDiscoveryConfig kubernetesDiscoveryConfig = new KubernetesDiscoveryConfig(kubernetesProperties.getNamespace(), kubernetesProperties.getDeploymentName(), kubernetesProperties.getPortName());
                         discoveryStrategy = DiscoveryStrategy.getInstance(kubernetesDiscoveryConfig);
                         connectionType = kubernetesProperties.getConnectionType();