You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/05/14 16:29:51 UTC

stratos git commit: Fixing public ip addresses used in kubernetes service creation

Repository: stratos
Updated Branches:
  refs/heads/master 3c880b65e -> fa139b0d4


Fixing public ip addresses used in kubernetes service creation


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fa139b0d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fa139b0d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fa139b0d

Branch: refs/heads/master
Commit: fa139b0d4b18fdb2607922905769e712cb17a8e0
Parents: 3c880b6
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu May 14 19:59:22 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu May 14 19:59:42 2015 +0530

----------------------------------------------------------------------
 .../cloud/controller/iaases/kubernetes/KubernetesIaas.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/fa139b0d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
index fe4f1ba..b756121 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
@@ -438,7 +438,7 @@ public class KubernetesIaas extends Iaas {
         }
 
         // Prepare minion public IP addresses
-        List<String> minionPublicIPs = new ArrayList<String>();
+        List<String> minionPrivateIPList = new ArrayList<String>();
         KubernetesHost[] kubernetesHosts = kubernetesCluster.getKubernetesHosts();
         if ((kubernetesHosts == null) || (kubernetesHosts.length == 0) || (kubernetesHosts[0] == null)) {
             throw new RuntimeException("Hosts not found in kubernetes cluster: [cluster] "
@@ -446,11 +446,11 @@ public class KubernetesIaas extends Iaas {
         }
         for (KubernetesHost host : kubernetesHosts) {
             if (host != null) {
-                minionPublicIPs.add(host.getPublicIPAddress());
+                minionPrivateIPList.add(host.getPrivateIPAddress());
             }
         }
         if (log.isDebugEnabled()) {
-            log.debug(String.format("Minion public IPs: %s", minionPublicIPs));
+            log.debug(String.format("Minion private IPs: %s", minionPrivateIPList));
         }
 
         if (cartridge.getPortMappings() != null) {
@@ -481,7 +481,7 @@ public class KubernetesIaas extends Iaas {
 
                 try {
                     kubernetesApi.createService(serviceId, serviceLabel, servicePort, containerPortName,
-                            minionPublicIPs.toArray(new String[minionPublicIPs.size()]));
+                            minionPrivateIPList.toArray(new String[minionPrivateIPList.size()]));
                 } finally {
                     // Persist kubernetes service sequence no
                     CloudControllerContext.getInstance().persist();