Skip to content

Commit 2f8e9ab

Browse files
nvazqueznvazquez
committed
Refactor column names and schema path
1 parent db50411 commit 2f8e9ab

7 files changed

Lines changed: 78 additions & 78 deletions

File tree

‎api/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,12 @@ enum State {
157157
Long getMaxSize();
158158
Long getSecurityGroupId();
159159
ClusterType getClusterType();
160-
Long getControlServiceOfferingId();
161-
Long getWorkerServiceOfferingId();
162-
Long getEtcdServiceOfferingId();
163-
Long getControlTemplateId();
164-
Long getWorkerTemplateId();
165-
Long getEtcdTemplateId();
160+
Long getControlNodeServiceOfferingId();
161+
Long getWorkerNodeServiceOfferingId();
162+
Long getEtcdNodeServiceOfferingId();
163+
Long getControlNodeTemplateId();
164+
Long getWorkerNodeTemplateId();
165+
Long getEtcdNodeTemplateId();
166166
Long getEtcdNodeCount();
167167
Long getCniConfigId();
168168
String getCniConfigDetails();

‎engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,26 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'last_mgmt_server_id', 'bigin
4545
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vm_template','for_cks', 'int(1) unsigned DEFAULT "0" COMMENT "if true, the template can be used for CKS cluster deployment"');
4646

4747
-- Add support for different node types service offerings on CKS clusters
48-
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','control_service_offering_id', 'bigint unsigned COMMENT "service offering ID for Control Node(s)"');
49-
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','worker_service_offering_id', 'bigint unsigned COMMENT "service offering ID for Worker Node(s)"');
50-
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','etcd_service_offering_id', 'bigint unsigned COMMENT "service offering ID for etcd Nodes"');
48+
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','control_node_service_offering_id', 'bigint unsigned COMMENT "service offering ID for Control Node(s)"');
49+
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','worker_node_service_offering_id', 'bigint unsigned COMMENT "service offering ID for Worker Node(s)"');
50+
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','etcd_node_service_offering_id', 'bigint unsigned COMMENT "service offering ID for etcd Nodes"');
5151
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','etcd_node_count', 'bigint unsigned COMMENT "number of etcd nodes to be deployed for the Kubernetes cluster"');
52-
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','control_template_id', 'bigint unsigned COMMENT "template id to be used for Control Node(s)"');
53-
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','worker_template_id', 'bigint unsigned COMMENT "template id to be used for Worker Node(s)"');
54-
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','etcd_template_id', 'bigint unsigned COMMENT "template id to be used for etcd Nodes"');
52+
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','control_node_template_id', 'bigint unsigned COMMENT "template id to be used for Control Node(s)"');
53+
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','worker_node_template_id', 'bigint unsigned COMMENT "template id to be used for Worker Node(s)"');
54+
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','etcd_node_template_id', 'bigint unsigned COMMENT "template id to be used for etcd Nodes"');
5555
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','cni_config_id', 'bigint unsigned COMMENT "user data id representing the associated cni configuration"');
5656
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster','cni_config_details', 'varchar(4096) DEFAULT NULL COMMENT "user data details representing the values required for the cni configuration associated"');
5757
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster_vm_map','etcd_node', 'tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT "indicates if the VM is an etcd node"');
5858
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster_vm_map','external_node', 'tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT "indicates if the node was imported into the Kubernetes cluster"');
5959
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster_vm_map','manual_upgrade', 'tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT "indicates if the node is marked for manual upgrade and excluded from the Kubernetes cluster upgrade operation"');
6060
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.kubernetes_cluster_vm_map','kubernetes_node_version', 'varchar(40) COMMENT "version of k8s the cluster node is on"');
6161

62-
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__control_service_offering_id` FOREIGN KEY `fk_cluster__control_service_offering_id`(`control_service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE;
63-
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__worker_service_offering_id` FOREIGN KEY `fk_cluster__worker_service_offering_id`(`worker_service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE;
64-
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__etcd_service_offering_id` FOREIGN KEY `fk_cluster__etcd_service_offering_id`(`etcd_service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE;
65-
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__control_template_id` FOREIGN KEY `fk_cluster__control_template_id`(`control_template_id`) REFERENCES `vm_template`(`id`) ON DELETE CASCADE;
66-
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__worker_template_id` FOREIGN KEY `fk_cluster__worker_template_id`(`worker_template_id`) REFERENCES `vm_template`(`id`) ON DELETE CASCADE;
67-
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__etcd_template_id` FOREIGN KEY `fk_cluster__etcd_template_id`(`etcd_template_id`) REFERENCES `vm_template`(`id`) ON DELETE CASCADE;
62+
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__control_node_service_offering_id` FOREIGN KEY `fk_cluster__control_node_service_offering_id`(`control_node_service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE;
63+
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__worker_node_service_offering_id` FOREIGN KEY `fk_cluster__worker_node_service_offering_id`(`worker_node_service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE;
64+
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__etcd_node_service_offering_id` FOREIGN KEY `fk_cluster__etcd_node_service_offering_id`(`etcd_node_service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE;
65+
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__control_node_template_id` FOREIGN KEY `fk_cluster__control_node_template_id`(`control_node_template_id`) REFERENCES `vm_template`(`id`) ON DELETE CASCADE;
66+
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__worker_node_template_id` FOREIGN KEY `fk_cluster__worker_node_template_id`(`worker_node_template_id`) REFERENCES `vm_template`(`id`) ON DELETE CASCADE;
67+
ALTER TABLE `cloud`.`kubernetes_cluster` ADD CONSTRAINT `fk_cluster__etcd_node_template_id` FOREIGN KEY `fk_cluster__etcd_node_template_id`(`etcd_node_template_id`) REFERENCES `vm_template`(`id`) ON DELETE CASCADE;
6868

6969
-- Add for_cks column to the user_data table to represent CNI Configuration stored as userdata
7070
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user_data','for_cks', 'int(1) unsigned DEFAULT "0" COMMENT "if true, the user data represent CNI configuration meant for CKS use only"');

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -773,9 +773,9 @@ public KubernetesClusterResponse createKubernetesClusterResponse(long kubernetes
773773
response.setCniConfigId(cniConfig.getUuid());
774774
response.setCniConfigName(cniConfig.getName());
775775
}
776-
setNodeTypeServiceOfferingResponse(response, WORKER, kubernetesCluster.getWorkerServiceOfferingId());
777-
setNodeTypeServiceOfferingResponse(response, CONTROL, kubernetesCluster.getControlServiceOfferingId());
778-
setNodeTypeServiceOfferingResponse(response, ETCD, kubernetesCluster.getEtcdServiceOfferingId());
776+
setNodeTypeServiceOfferingResponse(response, WORKER, kubernetesCluster.getWorkerNodeServiceOfferingId());
777+
setNodeTypeServiceOfferingResponse(response, CONTROL, kubernetesCluster.getControlNodeServiceOfferingId());
778+
setNodeTypeServiceOfferingResponse(response, ETCD, kubernetesCluster.getEtcdNodeServiceOfferingId());
779779

780780
if (kubernetesCluster.getEtcdNodeCount() != null) {
781781
response.setEtcdNodes(kubernetesCluster.getEtcdNodeCount());
@@ -1339,11 +1339,11 @@ protected void validateServiceOfferingsForNodeTypesScale(Map<String, Long> map,
13391339

13401340
private Long getExistingServiceOfferingIdForNodeType(String key, KubernetesClusterVO kubernetesCluster) {
13411341
if (key.equalsIgnoreCase(WORKER.name())) {
1342-
return kubernetesCluster.getWorkerServiceOfferingId();
1342+
return kubernetesCluster.getWorkerNodeServiceOfferingId();
13431343
} else if (key.equalsIgnoreCase(CONTROL.name())) {
1344-
return kubernetesCluster.getControlServiceOfferingId();
1344+
return kubernetesCluster.getControlNodeServiceOfferingId();
13451345
} else if (key.equalsIgnoreCase(ETCD.name())) {
1346-
return kubernetesCluster.getEtcdServiceOfferingId();
1346+
return kubernetesCluster.getEtcdNodeServiceOfferingId();
13471347
}
13481348
return kubernetesCluster.getServiceOfferingId();
13491349
}
@@ -1569,20 +1569,20 @@ public KubernetesClusterVO doInTransaction(TransactionStatus status) {
15691569
}
15701570
newCluster.setCniConfigDetails(cniConfigDetails);
15711571
if (serviceOfferingNodeTypeMap.containsKey(WORKER.name())) {
1572-
newCluster.setWorkerServiceOfferingId(serviceOfferingNodeTypeMap.get(WORKER.name()));
1572+
newCluster.setWorkerNodeServiceOfferingId(serviceOfferingNodeTypeMap.get(WORKER.name()));
15731573
}
15741574
if (serviceOfferingNodeTypeMap.containsKey(CONTROL.name())) {
1575-
newCluster.setControlServiceOfferingId(serviceOfferingNodeTypeMap.get(CONTROL.name()));
1575+
newCluster.setControlNodeServiceOfferingId(serviceOfferingNodeTypeMap.get(CONTROL.name()));
15761576
}
15771577
if (etcdNodes > 0) {
1578-
newCluster.setEtcdTemplateId(etcdNodeTemplate.getId());
1578+
newCluster.setEtcdNodeTemplateId(etcdNodeTemplate.getId());
15791579
newCluster.setEtcdNodeCount(etcdNodes);
15801580
if (serviceOfferingNodeTypeMap.containsKey(ETCD.name())) {
1581-
newCluster.setEtcdServiceOfferingId(serviceOfferingNodeTypeMap.get(ETCD.name()));
1581+
newCluster.setEtcdNodeServiceOfferingId(serviceOfferingNodeTypeMap.get(ETCD.name()));
15821582
}
15831583
}
1584-
newCluster.setWorkerTemplateId(workerNodeTemplate.getId());
1585-
newCluster.setControlTemplateId(controlNodeTemplate.getId());
1584+
newCluster.setWorkerNodeTemplateId(workerNodeTemplate.getId());
1585+
newCluster.setControlNodeTemplateId(controlNodeTemplate.getId());
15861586
if (zone.isSecurityGroupEnabled()) {
15871587
newCluster.setSecurityGroupId(finalSecurityGroup.getId());
15881588
}

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -118,26 +118,26 @@ public class KubernetesClusterVO implements KubernetesCluster {
118118
@Column(name = "cluster_type")
119119
private ClusterType clusterType;
120120

121-
@Column(name = "control_service_offering_id")
122-
private Long controlServiceOfferingId;
121+
@Column(name = "control_node_service_offering_id")
122+
private Long controlNodeServiceOfferingId;
123123

124-
@Column(name = "worker_service_offering_id")
125-
private Long workerServiceOfferingId;
124+
@Column(name = "worker_node_service_offering_id")
125+
private Long workerNodeServiceOfferingId;
126126

127-
@Column(name = "etcd_service_offering_id")
128-
private Long etcdServiceOfferingId;
127+
@Column(name = "etcd_node_service_offering_id")
128+
private Long etcdNodeServiceOfferingId;
129129

130130
@Column(name = "etcd_node_count")
131131
private Long etcdNodeCount;
132132

133-
@Column(name = "control_template_id")
134-
private Long controlTemplateId;
133+
@Column(name = "control_node_template_id")
134+
private Long controlNodeTemplateId;
135135

136-
@Column(name = "worker_template_id")
137-
private Long workerTemplateId;
136+
@Column(name = "worker_node_template_id")
137+
private Long workerNodeTemplateId;
138138

139-
@Column(name = "etcd_template_id")
140-
private Long etcdTemplateId;
139+
@Column(name = "etcd_node_template_id")
140+
private Long etcdNodeTemplateId;
141141

142142
@Column(name = "cni_config_id", nullable = true)
143143
private Long cniConfigId = null;
@@ -442,28 +442,28 @@ public Class<?> getEntityType() {
442442
return KubernetesCluster.class;
443443
}
444444

445-
public Long getControlServiceOfferingId() {
446-
return controlServiceOfferingId;
445+
public Long getControlNodeServiceOfferingId() {
446+
return controlNodeServiceOfferingId;
447447
}
448448

449-
public void setControlServiceOfferingId(Long controlServiceOfferingId) {
450-
this.controlServiceOfferingId = controlServiceOfferingId;
449+
public void setControlNodeServiceOfferingId(Long controlNodeServiceOfferingId) {
450+
this.controlNodeServiceOfferingId = controlNodeServiceOfferingId;
451451
}
452452

453-
public Long getWorkerServiceOfferingId() {
454-
return workerServiceOfferingId;
453+
public Long getWorkerNodeServiceOfferingId() {
454+
return workerNodeServiceOfferingId;
455455
}
456456

457-
public void setWorkerServiceOfferingId(Long workerServiceOfferingId) {
458-
this.workerServiceOfferingId = workerServiceOfferingId;
457+
public void setWorkerNodeServiceOfferingId(Long workerNodeServiceOfferingId) {
458+
this.workerNodeServiceOfferingId = workerNodeServiceOfferingId;
459459
}
460460

461-
public Long getEtcdServiceOfferingId() {
462-
return etcdServiceOfferingId;
461+
public Long getEtcdNodeServiceOfferingId() {
462+
return etcdNodeServiceOfferingId;
463463
}
464464

465-
public void setEtcdServiceOfferingId(Long etcdServiceOfferingId) {
466-
this.etcdServiceOfferingId = etcdServiceOfferingId;
465+
public void setEtcdNodeServiceOfferingId(Long etcdNodeServiceOfferingId) {
466+
this.etcdNodeServiceOfferingId = etcdNodeServiceOfferingId;
467467
}
468468

469469
public Long getEtcdNodeCount() {
@@ -474,28 +474,28 @@ public void setEtcdNodeCount(Long etcdNodeCount) {
474474
this.etcdNodeCount = etcdNodeCount;
475475
}
476476

477-
public Long getEtcdTemplateId() {
478-
return etcdTemplateId;
477+
public Long getEtcdNodeTemplateId() {
478+
return etcdNodeTemplateId;
479479
}
480480

481-
public void setEtcdTemplateId(Long etcdTemplateId) {
482-
this.etcdTemplateId = etcdTemplateId;
481+
public void setEtcdNodeTemplateId(Long etcdNodeTemplateId) {
482+
this.etcdNodeTemplateId = etcdNodeTemplateId;
483483
}
484484

485-
public Long getWorkerTemplateId() {
486-
return workerTemplateId;
485+
public Long getWorkerNodeTemplateId() {
486+
return workerNodeTemplateId;
487487
}
488488

489-
public void setWorkerTemplateId(Long workerTemplateId) {
490-
this.workerTemplateId = workerTemplateId;
489+
public void setWorkerNodeTemplateId(Long workerNodeTemplateId) {
490+
this.workerNodeTemplateId = workerNodeTemplateId;
491491
}
492492

493-
public Long getControlTemplateId() {
494-
return controlTemplateId;
493+
public Long getControlNodeTemplateId() {
494+
return controlNodeTemplateId;
495495
}
496496

497-
public void setControlTemplateId(Long controlTemplateId) {
498-
this.controlTemplateId = controlTemplateId;
497+
public void setControlNodeTemplateId(Long controlNodeTemplateId) {
498+
this.controlNodeTemplateId = controlNodeTemplateId;
499499
}
500500

501501
public Long getCniConfigId() {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ protected void init() {
258258
VMTemplateVO template = templateDao.findById(templateId);
259259
Hypervisor.HypervisorType type = template.getHypervisorType();
260260
this.clusterTemplate = manager.getKubernetesServiceTemplate(dataCenterVO, type, null, KubernetesClusterNodeType.DEFAULT);
261-
this.controlNodeTemplate = templateDao.findById(this.kubernetesCluster.getControlTemplateId());
262-
this.workerNodeTemplate = templateDao.findById(this.kubernetesCluster.getWorkerTemplateId());
263-
this.etcdTemplate = templateDao.findById(this.kubernetesCluster.getEtcdTemplateId());
261+
this.controlNodeTemplate = templateDao.findById(this.kubernetesCluster.getControlNodeTemplateId());
262+
this.workerNodeTemplate = templateDao.findById(this.kubernetesCluster.getWorkerNodeTemplateId());
263+
this.etcdTemplate = templateDao.findById(this.kubernetesCluster.getEtcdNodeTemplateId());
264264
this.sshKeyFile = getManagementServerSshPublicKeyFile();
265265
}
266266

@@ -827,9 +827,9 @@ protected ServiceOffering getServiceOfferingForNodeTypeOnCluster(KubernetesClust
827827
KubernetesCluster cluster) {
828828
Long offeringId = null;
829829
Long defaultOfferingId = cluster.getServiceOfferingId();
830-
Long controlOfferingId = cluster.getControlServiceOfferingId();
831-
Long workerOfferingId = cluster.getWorkerServiceOfferingId();
832-
Long etcdOfferingId = cluster.getEtcdServiceOfferingId();
830+
Long controlOfferingId = cluster.getControlNodeServiceOfferingId();
831+
Long workerOfferingId = cluster.getWorkerNodeServiceOfferingId();
832+
Long etcdOfferingId = cluster.getEtcdNodeServiceOfferingId();
833833
if (KubernetesClusterNodeType.CONTROL == nodeType) {
834834
offeringId = controlOfferingId != null ? controlOfferingId : defaultOfferingId;
835835
} else if (KubernetesClusterNodeType.WORKER == nodeType) {
@@ -847,7 +847,7 @@ protected ServiceOffering getServiceOfferingForNodeTypeOnCluster(KubernetesClust
847847
}
848848

849849
protected boolean isDefaultTemplateUsed() {
850-
if (Arrays.asList(kubernetesCluster.getControlTemplateId(), kubernetesCluster.getWorkerTemplateId(), kubernetesCluster.getEtcdTemplateId()).contains(kubernetesCluster.getTemplateId())) {
850+
if (Arrays.asList(kubernetesCluster.getControlNodeTemplateId(), kubernetesCluster.getWorkerNodeTemplateId(), kubernetesCluster.getEtcdNodeTemplateId()).contains(kubernetesCluster.getTemplateId())) {
851851
return true;
852852
}
853853
return false;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -837,11 +837,11 @@ protected KubernetesClusterVO updateKubernetesClusterEntry(final Long cores, fin
837837
}
838838
if (updateNodeOffering && serviceOfferingId != null && nodeType != null) {
839839
if (WORKER == nodeType) {
840-
updatedCluster.setWorkerServiceOfferingId(serviceOfferingId);
840+
updatedCluster.setWorkerNodeServiceOfferingId(serviceOfferingId);
841841
} else if (CONTROL == nodeType) {
842-
updatedCluster.setControlServiceOfferingId(serviceOfferingId);
842+
updatedCluster.setControlNodeServiceOfferingId(serviceOfferingId);
843843
} else if (ETCD == nodeType) {
844-
updatedCluster.setEtcdServiceOfferingId(serviceOfferingId);
844+
updatedCluster.setEtcdNodeServiceOfferingId(serviceOfferingId);
845845
}
846846
}
847847
if (updateClusterOffering && serviceOfferingId != null) {

‎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
@@ -532,8 +532,8 @@ public boolean scaleCluster() throws CloudRuntimeException {
532532
boolean hasDefaultOffering = serviceOfferingNodeTypeMap.containsKey(DEFAULT.name());
533533
if (hasDefaultOffering) {
534534
final ServiceOffering existingServiceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
535-
final ServiceOffering existingControlOffering = serviceOfferingDao.findById(kubernetesCluster.getControlServiceOfferingId());
536-
final ServiceOffering existingWorkerOffering = serviceOfferingDao.findById(kubernetesCluster.getWorkerServiceOfferingId());
535+
final ServiceOffering existingControlOffering = serviceOfferingDao.findById(kubernetesCluster.getControlNodeServiceOfferingId());
536+
final ServiceOffering existingWorkerOffering = serviceOfferingDao.findById(kubernetesCluster.getWorkerNodeServiceOfferingId());
537537
if (existingServiceOffering == null && ObjectUtils.anyNull(existingControlOffering, existingWorkerOffering)) {
538538
logAndThrow(Level.ERROR, String.format("Scaling Kubernetes cluster : %s failed, service offering for the Kubernetes cluster not found!", kubernetesCluster.getName()));
539539
}

0 commit comments

Comments
 (0)