From a490dbbca7c749e064d5a3e33b73b3de69030ba0 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Tue, 21 May 2024 22:46:15 -0300 Subject: [PATCH] Fix build --- .../cluster/KubernetesClusterManagerImpl.java | 2 +- .../actionworkers/KubernetesClusterStartWorker.java | 12 ++++++------ .../src/main/resources/conf/etcd-node.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java index d54c81ba7ff..d75b009103a 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java @@ -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) { diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java index 855c4446a1e..1553c554d14 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java @@ -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 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 etcdVmIds = etcdVms.stream().map(UserVm::getId).collect(Collectors.toList()); diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml index e5ec6ab70a9..c380151f49d 100644 --- a/plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml +++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml @@ -131,4 +131,4 @@ runcmd: - chown -R cloud:cloud /home/cloud/.ssh - /opt/bin/setup-etcd-node - systemctl daemon-reload - - systemctl enable --now etcd \ No newline at end of file + - systemctl enable --now etcd