etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CKS cluster version upgrade

This commit is contained in:
Nicolas Vazquez 2024-05-29 18:09:01 -03:00 committed by nvazquez
parent 1d6d5d2fa9
commit a50108294f
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
View File

@ -371,7 +371,9 @@ public class KubernetesClusterActionWorker {
newClusterVmMap.setExternalNode(isExternalNode);
newClusterVmMap.setManualUpgrade(markForManualUpgrade);
newClusterVmMap.setEtcdNode(isEtcdNode);
newClusterVmMap.setNodeVersion(kubernetesVersion.getSemanticVersion());
if (!isEtcdNode) {
newClusterVmMap.setNodeVersion(kubernetesVersion.getSemanticVersion());
}
kubernetesClusterVmMapDao.persist(newClusterVmMap);
return newClusterVmMap;
}

7
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/utils/KubernetesClusterUtil.java
View File

@ -349,8 +349,11 @@ public class KubernetesClusterUtil {
10000, 10000, 20000);
Pair<Boolean, String> clusterVersionMatchesAndValue = clusterNodeVersionMatches(result, version);
if (Boolean.TRUE.equals(clusterVersionMatchesAndValue.first())) {
KubernetesClusterVmMapVO vmMapVO = vmMapDao.findById(vmId);
vmMapVO.setNodeVersion(clusterVersionMatchesAndValue.second());
KubernetesClusterVmMapVO vmMapVO = vmMapDao.getClusterMapFromVmId(vmId);
String newNodeVersion = clusterVersionMatchesAndValue.second();
LOGGER.debug(String.format("Updating node %s Kubernetes version to %s", hostName, newNodeVersion));
vmMapVO.setNodeVersion(newNodeVersion);
vmMapDao.update(vmMapVO.getId(), vmMapVO);
return true;
}
} catch (Exception e) {