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 13dc4d8ba38..9e602383d0d 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 @@ -252,7 +252,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker { } catch (Exception e) { String errMsg = String.format("Unexpected exception while trying to add the external node %s to the Kubernetes cluster %s: %s", nodeId, kubernetesCluster.getName(), e.getMessage()); - LOGGER.error(errMsg, e); + logger.error(errMsg, e); revertNetworkRules(network, nodeId, sshStartPort); throw new CloudRuntimeException(e); } @@ -309,15 +309,15 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker { } private void revertNetworkRules(Network network, long vmId, int port) { - LOGGER.debug(String.format("Reverting network rules for VM ID %s on network %s", vmId, network.getName())); + logger.debug(String.format("Reverting network rules for VM ID %s on network %s", vmId, network.getName())); FirewallRuleVO ruleVO = firewallRulesDao.findByNetworkIdAndPorts(network.getId(), port, port); if (Objects.isNull(network.getVpcId())) { - LOGGER.debug(String.format("Removing firewall rule %s", ruleVO.getId())); + logger.debug(String.format("Removing firewall rule %s", ruleVO.getId())); firewallService.revokeIngressFirewallRule(ruleVO.getId(), true); } List pfRules = portForwardingRulesDao.listByVm(vmId); for (PortForwardingRuleVO pfRule : pfRules) { - LOGGER.debug(String.format("Removing port forwarding rule %s", pfRule.getId())); + logger.debug(String.format("Removing port forwarding rule %s", pfRule.getId())); rulesService.revokePortForwardingRule(pfRule.getId(), true); } } diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java index 99d894b2e92..ab561329afb 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java @@ -249,7 +249,7 @@ public class KubernetesClusterDestroyWorker extends KubernetesClusterResourceMod List externalNodes = clusterVMs.stream().filter(KubernetesClusterVmMapVO::isExternalNode).collect(Collectors.toList()); if (!externalNodes.isEmpty()) { String errMsg = String.format("Failed to delete kubernetes cluster %s as there are %s external node(s) present. Please remove the external node(s) from the cluster (and network) or delete them before deleting the cluster.", kubernetesCluster.getName(), externalNodes.size()); - LOGGER.error(errMsg); + logger.error(errMsg); throw new CloudRuntimeException(errMsg); } if (network != null) { 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 98aa8ae349a..33e324d6bb5 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 @@ -614,8 +614,8 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif } else if (network.getNetworkACLId() != NetworkACL.DEFAULT_ALLOW) { try { provisionVpcTierAllowPortACLRule(network, ETCD_NODE_CLIENT_REQUEST_PORT, ETCD_NODE_CLIENT_REQUEST_PORT); - if (LOGGER.isInfoEnabled()) { - LOGGER.info(String.format("Provisioned ACL rule to open up port %d on %s for etcd nodes for Kubernetes cluster %s", + if (logger.isInfoEnabled()) { + logger.info(String.format("Provisioned ACL rule to open up port %d on %s for etcd nodes for Kubernetes cluster %s", ETCD_NODE_CLIENT_REQUEST_PORT, publicIpAddress, kubernetesCluster.getName())); } } catch (NoSuchFieldException | IllegalAccessException | ResourceUnavailableException | InvalidParameterValueException | PermissionDeniedException e) {