Skip to content

Commit a5d4bd5

Browse files
authored
Display Kubernetes cluster name instead of uuid (#4411)
1 parent 5b3f351 commit a5d4bd5

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,11 +1187,10 @@ public KubernetesClusterConfigResponse getKubernetesClusterConfig(GetKubernetesC
11871187
if (clusterDetailsVO != null && !Strings.isNullOrEmpty(clusterDetailsVO.getValue())) {
11881188
configData = new String(Base64.decodeBase64(clusterDetailsVO.getValue()));
11891189
} else {
1190-
if (KubernetesCluster.State.Starting.equals(kubernetesCluster.getState())) {
1191-
throw new CloudRuntimeException(String.format("Setup is in progress for Kubernetes cluster ID: %s, config not available at this moment", kubernetesCluster.getUuid()));
1192-
} else {
1193-
throw new CloudRuntimeException((String.format("Config not found for Kubernetes cluster ID: %s", kubernetesCluster.getUuid())));
1194-
}
1190+
String exceptionMessage = KubernetesCluster.State.Starting.equals(kubernetesCluster.getState()) ?
1191+
String.format("Setup is in progress for Kubernetes cluster : %s, config not available at this moment", kubernetesCluster.getName()) :
1192+
String.format("Config not found for Kubernetes cluster : %s", kubernetesCluster.getName());
1193+
throw new CloudRuntimeException(exceptionMessage);
11951194
}
11961195
response.setConfigData(configData);
11971196
response.setObjectName("clusterconfig");

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -579,22 +579,22 @@ public boolean startStoppedKubernetesCluster() throws CloudRuntimeException {
579579
try {
580580
InetAddress address = InetAddress.getByName(new URL(kubernetesCluster.getEndpoint()).getHost());
581581
} catch (MalformedURLException | UnknownHostException ex) {
582-
logTransitStateAndThrow(Level.ERROR, String.format("Kubernetes cluster ID: %s has invalid API endpoint. Can not verify if cluster is in ready state", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
582+
logTransitStateAndThrow(Level.ERROR, String.format("Kubernetes cluster : %s has invalid API endpoint. Can not verify if cluster is in ready state", kubernetesCluster.getName()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
583583
}
584584
Pair<String, Integer> sshIpPort = getKubernetesClusterServerIpSshPort(null);
585585
publicIpAddress = sshIpPort.first();
586586
sshPort = sshIpPort.second();
587587
if (Strings.isNullOrEmpty(publicIpAddress)) {
588-
logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s as no public IP found for the cluster" , kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
588+
logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster : %s as no public IP found for the cluster" , kubernetesCluster.getName()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
589589
}
590590
if (!KubernetesClusterUtil.isKubernetesClusterServerRunning(kubernetesCluster, publicIpAddress, CLUSTER_API_PORT, startTimeoutTime, 15000)) {
591-
logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s in usable state", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
591+
logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster : %s in usable state", kubernetesCluster.getName()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
592592
}
593593
if (!isKubernetesClusterKubeConfigAvailable(startTimeoutTime)) {
594-
logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s in usable state as unable to retrieve kube-config for the cluster", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
594+
logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster : %s in usable state as unable to retrieve kube-config for the cluster", kubernetesCluster.getName()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
595595
}
596596
if (!isKubernetesClusterDashboardServiceRunning(false, startTimeoutTime)) {
597-
logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s in usable state as unable to get Dashboard service running for the cluster", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
597+
logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster : %s in usable state as unable to get Dashboard service running for the cluster", kubernetesCluster.getName()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
598598
}
599599
stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
600600
if (LOGGER.isInfoEnabled()) {

0 commit comments

Comments
 (0)