Skip to content

Commit 6568c50

Browse files
committed
Address review comments
1 parent f53d137 commit 6568c50

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,7 +1927,7 @@ public boolean scaleKubernetesCluster(ScaleKubernetesClusterCmd cmd) throws Clou
19271927

19281928
String[] keys = getServiceUserKeys(kubernetesCluster);
19291929
KubernetesClusterScaleWorker scaleWorker =
1930-
new KubernetesClusterScaleWorker(kubernetesClusterDao.findById(cmd.getId()),
1930+
new KubernetesClusterScaleWorker(kubernetesCluster,
19311931
nodeToOfferingMap,
19321932
cmd.getClusterSize(),
19331933
cmd.getNodeIds(),
@@ -1942,7 +1942,7 @@ public boolean scaleKubernetesCluster(ScaleKubernetesClusterCmd cmd) throws Clou
19421942

19431943
/**
19441944
* Creates a map for the requested node type service offering
1945-
* For the node type ALL: Every node is scaled to the same offering
1945+
* For the node type DEFAULT: Every node is scaled to the same offering
19461946
*/
19471947
protected Map<String, ServiceOffering> createNodeTypeToServiceOfferingMap(Map<String, Long> idsMapping,
19481948
Long serviceOfferingId, KubernetesClusterVO kubernetesCluster) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ protected void checkNodeTypeOfferingEntryValues(String nodeTypeStr, ServiceOffer
167167

168168
protected void addNodeTypeOfferingEntry(String nodeTypeStr, String serviceOfferingUuid, ServiceOffering serviceOffering, Map<String, Long> mapping) {
169169
if (logger.isDebugEnabled()) {
170-
logger.debug(String.format("Node Type: '%s' should use Service Offering ID: '%s'", nodeTypeStr, serviceOfferingUuid));
170+
logger.debug("Node Type: '{}' should use Service Offering ID: '{}'", nodeTypeStr, serviceOfferingUuid);
171171
}
172172
KubernetesClusterNodeType nodeType = KubernetesClusterNodeType.valueOf(nodeTypeStr.toUpperCase());
173173
mapping.put(nodeType.name(), serviceOffering.getId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ protected Map<String, DeployDestination> planKubernetesCluster(Long domainId, Lo
282282
}
283283
ServiceOffering nodeOffering = getServiceOfferingForNodeTypeOnCluster(nodeType, kubernetesCluster);
284284
if (logger.isDebugEnabled()) {
285-
logger.debug(String.format("Checking deployment destination for %s nodes on Kubernetes cluster : %s in zone : %s", nodeType.name(), kubernetesCluster.getName(), zone.getName()));
285+
logger.debug("Checking deployment destination for {} nodes on Kubernetes cluster : {} in zone : {}", nodeType.name(), kubernetesCluster.getName(), zone.getName());
286286
}
287287
DeployDestination planForNodeType = plan(nodes, zone, nodeOffering, domainId, accountId, hypervisorType);
288288
destinationMap.put(nodeType.name(), planForNodeType);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,15 +528,15 @@ public boolean scaleCluster() throws CloudRuntimeException {
528528
}
529529
scaleTimeoutTime = System.currentTimeMillis() + KubernetesClusterService.KubernetesClusterScaleTimeout.value() * 1000;
530530
final long originalClusterSize = kubernetesCluster.getNodeCount();
531-
if (serviceOfferingNodeTypeMap.containsKey(DEFAULT.name())) {
531+
boolean hasDefaultOffering = serviceOfferingNodeTypeMap.containsKey(DEFAULT.name());
532+
if (hasDefaultOffering) {
532533
final ServiceOffering existingServiceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
533534
if (existingServiceOffering == null) {
534535
logAndThrow(Level.ERROR, String.format("Scaling Kubernetes cluster : %s failed, service offering for the Kubernetes cluster not found!", kubernetesCluster.getName()));
535536
}
536537
}
537538

538539
final boolean autoscalingChanged = isAutoscalingChanged();
539-
boolean hasDefaultOffering = serviceOfferingNodeTypeMap.containsKey(DEFAULT.name());
540540
Long existingDefaultOfferingId = kubernetesCluster.getServiceOfferingId();
541541
ServiceOffering defaultServiceOffering = serviceOfferingNodeTypeMap.getOrDefault(DEFAULT.name(), null);
542542

plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,23 @@ public class CreateKubernetesClusterCmd extends BaseAsyncCreateCmd {
111111
@ACL(accessType = AccessType.UseEntry)
112112
@Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = CommandType.UUID, entityType = ServiceOfferingResponse.class,
113113
description = "the ID of the service offering for the virtual machines in the cluster.")
114-
protected Long serviceOfferingId;
114+
private Long serviceOfferingId;
115115

116116
@ACL(accessType = AccessType.UseEntry)
117117
@Parameter(name = ApiConstants.NODE_TYPE_OFFERING_MAP, type = CommandType.MAP,
118118
description = "(Optional) Node Type to Service Offering ID mapping. If provided, it overrides the serviceofferingid parameter")
119-
protected Map<String, Map<String, String>> serviceOfferingNodeTypeMap;
119+
private Map<String, Map<String, String>> serviceOfferingNodeTypeMap;
120120

121121
@ACL(accessType = AccessType.UseEntry)
122122
@Parameter(name = ApiConstants.NODE_TYPE_TEMPLATE_MAP, type = CommandType.MAP,
123123
description = "(Optional) Node Type to Template ID mapping. If provided, it overrides the default template: System VM template")
124-
protected Map<String, Map<String, String>> templateNodeTypeMap;
124+
private Map<String, Map<String, String>> templateNodeTypeMap;
125125

126126
@ACL(accessType = AccessType.UseEntry)
127127
@Parameter(name = ApiConstants.ETCD_NODES, type = CommandType.LONG,
128128
description = "(Optional) Number of Kubernetes cluster etcd nodes, default is 0." +
129129
"In case the number is greater than 0, etcd nodes are separate from master nodes and are provisioned accordingly")
130-
protected Long etcdNodes;
130+
private Long etcdNodes;
131131

132132
@ACL(accessType = AccessType.UseEntry)
133133
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the" +

0 commit comments

Comments
 (0)