From bac0a2e64e894183db0a7b9e2cabdfc0467a8b39 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 28 May 2024 11:14:58 -0400 Subject: [PATCH] CKS: Exclude etcd nodes when calculating port numbers --- .../cluster/actionworkers/KubernetesClusterActionWorker.java | 2 +- .../cluster/actionworkers/KubernetesClusterAddWorker.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java index b916e22bde4..b02504560ea 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java @@ -922,7 +922,7 @@ public class KubernetesClusterActionWorker { try { List clusterVmList = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId()); List externalNodes = clusterVmList.stream().filter(KubernetesClusterVmMapVO::isExternalNode).collect(Collectors.toList()); - int endPort = (CLUSTER_NODES_DEFAULT_START_SSH_PORT + clusterVmList.size() - externalNodes.size() - 1); + int endPort = (CLUSTER_NODES_DEFAULT_START_SSH_PORT + clusterVmList.size() - externalNodes.size() - kubernetesCluster.getEtcdNodeCount().intValue() - 1); provisionFirewallRules(publicIp, owner, CLUSTER_NODES_DEFAULT_START_SSH_PORT, endPort); if (logger.isInfoEnabled()) { logger.info(String.format("Provisioned firewall rule to open up port %d to %d on %s for Kubernetes cluster : %s", CLUSTER_NODES_DEFAULT_START_SSH_PORT, endPort, publicIp.getAddress().addr(), kubernetesCluster.getName())); diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterAddWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterAddWorker.java index 2d22d295aab..13dc4d8ba38 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterAddWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterAddWorker.java @@ -220,7 +220,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker { private Pair validateAndSetupNode(Network network, IpAddress publicIp, Account account, Long nodeId, int nodeIndex, String base64UserData) { - int startSshPortNumber = KubernetesClusterActionWorker.CLUSTER_NODES_DEFAULT_START_SSH_PORT + (int) kubernetesCluster.getTotalNodeCount(); + int startSshPortNumber = KubernetesClusterActionWorker.CLUSTER_NODES_DEFAULT_START_SSH_PORT + (int) kubernetesCluster.getTotalNodeCount() - kubernetesCluster.getEtcdNodeCount().intValue(); int sshStartPort = startSshPortNumber + nodeIndex; try { if (Objects.isNull(network.getVpcId())) {