Skip to content

Fix default node offerings saved for Kubernetes clusters #14613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zheng1771 wants to merge 1 commit into
base: 4.22
Choose a base branch
from
+62 −9
Open

Fix default node offerings saved for Kubernetes clusters #14613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ...etes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1442,6 +1442,15 @@ protected void validateServiceOfferingsForNodeTypesScale(Map<String, Long> map,
}
}

protected void setNodeServiceOfferingIds(KubernetesClusterVO cluster, Map<String, Long> serviceOfferingNodeTypeMap) {
Long defaultServiceOfferingId = cluster.getServiceOfferingId();
cluster.setWorkerNodeServiceOfferingId(serviceOfferingNodeTypeMap.getOrDefault(WORKER.name(), defaultServiceOfferingId));
cluster.setControlNodeServiceOfferingId(serviceOfferingNodeTypeMap.getOrDefault(CONTROL.name(), defaultServiceOfferingId));
if (cluster.getEtcdNodeCount() > 0) {
cluster.setEtcdNodeServiceOfferingId(serviceOfferingNodeTypeMap.getOrDefault(ETCD.name(), defaultServiceOfferingId));
}
}

private Long getExistingServiceOfferingIdForNodeType(String key, KubernetesClusterVO kubernetesCluster) {
if (key.equalsIgnoreCase(WORKER.name())) {
return kubernetesCluster.getWorkerNodeServiceOfferingId();
Expand Down Expand Up @@ -1674,19 +1683,11 @@ public KubernetesClusterVO doInTransaction(TransactionStatus status) {
cniConfigDetails = cmd.getCniConfigDetails().toString();
}
newCluster.setCniConfigDetails(cniConfigDetails);
if (serviceOfferingNodeTypeMap.containsKey(WORKER.name())) {
newCluster.setWorkerNodeServiceOfferingId(serviceOfferingNodeTypeMap.get(WORKER.name()));
}
if (serviceOfferingNodeTypeMap.containsKey(CONTROL.name())) {
newCluster.setControlNodeServiceOfferingId(serviceOfferingNodeTypeMap.get(CONTROL.name()));
}
if (etcdNodes > 0) {
newCluster.setEtcdNodeTemplateId(etcdNodeTemplate.getId());
newCluster.setEtcdNodeCount(etcdNodes);
if (serviceOfferingNodeTypeMap.containsKey(ETCD.name())) {
newCluster.setEtcdNodeServiceOfferingId(serviceOfferingNodeTypeMap.get(ETCD.name()));
}
}
setNodeServiceOfferingIds(newCluster, serviceOfferingNodeTypeMap);
newCluster.setWorkerNodeTemplateId(workerNodeTemplate.getId());
newCluster.setControlNodeTemplateId(controlNodeTemplate.getId());
if (zone.isSecurityGroupEnabled()) {
Expand Down
52 changes: 52 additions & 0 deletions ...-service/src/test/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,58 @@ public class KubernetesClusterManagerImplTest {
@InjectMocks
KubernetesClusterManagerImpl kubernetesClusterManager;

@Test
public void testSetNodeServiceOfferingIdsWithDefaultOffering() {
KubernetesClusterVO cluster = new KubernetesClusterVO();
cluster.setServiceOfferingId(1L);

kubernetesClusterManager.setNodeServiceOfferingIds(cluster, Collections.emptyMap());

Assert.assertEquals(Long.valueOf(1L), cluster.getWorkerNodeServiceOfferingId());
Assert.assertEquals(Long.valueOf(1L), cluster.getControlNodeServiceOfferingId());
Assert.assertNull(cluster.getEtcdNodeServiceOfferingId());
}

@Test
public void testSetNodeServiceOfferingIdsWithPartialOverrides() {
KubernetesClusterVO cluster = new KubernetesClusterVO();
cluster.setServiceOfferingId(1L);
cluster.setEtcdNodeCount(3L);

kubernetesClusterManager.setNodeServiceOfferingIds(cluster, Map.of(WORKER.name(), 2L));

Assert.assertEquals(Long.valueOf(2L), cluster.getWorkerNodeServiceOfferingId());
Assert.assertEquals(Long.valueOf(1L), cluster.getControlNodeServiceOfferingId());
Assert.assertEquals(Long.valueOf(1L), cluster.getEtcdNodeServiceOfferingId());
}

@Test
public void testSetNodeServiceOfferingIdsWithOnlyExplicitOfferings() {
KubernetesClusterVO cluster = new KubernetesClusterVO();
cluster.setEtcdNodeCount(3L);

kubernetesClusterManager.setNodeServiceOfferingIds(cluster,
Map.of(WORKER.name(), 2L, CONTROL.name(), 3L, ETCD.name(), 4L));

Assert.assertEquals(Long.valueOf(2L), cluster.getWorkerNodeServiceOfferingId());
Assert.assertEquals(Long.valueOf(3L), cluster.getControlNodeServiceOfferingId());
Assert.assertEquals(Long.valueOf(4L), cluster.getEtcdNodeServiceOfferingId());
Assert.assertNull(cluster.getServiceOfferingId());
}

@Test
public void testSetNodeServiceOfferingIdsWithoutSeparateEtcdNodes() {
KubernetesClusterVO cluster = new KubernetesClusterVO();
cluster.setServiceOfferingId(1L);

kubernetesClusterManager.setNodeServiceOfferingIds(cluster,
Map.of(WORKER.name(), 2L, CONTROL.name(), 3L, ETCD.name(), 4L));

Assert.assertEquals(Long.valueOf(2L), cluster.getWorkerNodeServiceOfferingId());
Assert.assertEquals(Long.valueOf(3L), cluster.getControlNodeServiceOfferingId());
Assert.assertNull(cluster.getEtcdNodeServiceOfferingId());
}

@Test
public void testValidateVpcTierAllocated() {
Network network = Mockito.mock(Network.class);
Expand Down