etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build

This commit is contained in:
nvazquez 2024-05-21 22:46:15 -03:00
parent 98389a116d
commit a490dbbca7
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
View File

@ -1538,7 +1538,7 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
if (hypervisorType != deploymentHypervisor) {
String msg = String.format("The hypervisor type planned for the CKS cluster deployment %s is different " +
"from the selected hypervisor %s", deployDestination.getCluster().getHypervisorType(), hypervisorType);
LOGGER.warn(msg);
logger.warn(msg);
}
}
} catch (InsufficientCapacityException e) {

12
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
View File

@ -466,8 +466,8 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null);
}
if (LOGGER.isInfoEnabled()) {
LOGGER.info(String.format("Created control VM ID : %s, %s in the Kubernetes cluster : %s", etcdNode.getUuid(), hostName, kubernetesCluster.getName()));
if (logger.isInfoEnabled()) {
logger.info(String.format("Created control VM ID : %s, %s in the Kubernetes cluster : %s", etcdNode.getUuid(), hostName, kubernetesCluster.getName()));
}
return etcdNode;
}
@ -532,8 +532,8 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
throw new ManagementServerException(String.format("Failed to provision additional control VM for Kubernetes cluster : %s" , kubernetesCluster.getName()));
}
etcdNodeVms.add(vm);
if (LOGGER.isInfoEnabled()) {
LOGGER.info(String.format("Provisioned additional control VM : %s in to the Kubernetes cluster : %s", vm.getDisplayName(), kubernetesCluster.getName()));
if (logger.isInfoEnabled()) {
logger.info(String.format("Provisioned additional control VM : %s in to the Kubernetes cluster : %s", vm.getDisplayName(), kubernetesCluster.getName()));
}
}
return new Pair<>(etcdNodeVms, etcdNodeGuestIps);
@ -596,8 +596,8 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
protected void setupKubernetesEtcdNetworkRules(List<UserVm> etcdVms, Network network) throws ManagementServerException, ResourceUnavailableException {
if (!Network.GuestType.Isolated.equals(network.getGuestType())) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(String.format("Network : %s for Kubernetes cluster : %s is not an isolated network, therefore, no need for network rules", network.getName(), kubernetesCluster.getName()));
if (logger.isDebugEnabled()) {
logger.debug(String.format("Network : %s for Kubernetes cluster : %s is not an isolated network, therefore, no need for network rules", network.getName(), kubernetesCluster.getName()));
}
}
List<Long> etcdVmIds = etcdVms.stream().map(UserVm::getId).collect(Collectors.toList());

2
plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml
View File

@ -131,4 +131,4 @@ runcmd:
- chown -R cloud:cloud /home/cloud/.ssh
- /opt/bin/setup-etcd-node
- systemctl daemon-reload
- systemctl enable --now etcd
- systemctl enable --now etcd