nebulous/optimiser-controller
Code Issues Proposed changes

Add affinity traits during redeployment

Browse Source 
Change-Id: Ie6f5ea814c2dea466dc91ee8a809e6976a274a9d
This commit is contained in:
Rudi Schlatte 2024-05-14 15:54:13 +02:00
parent a5a444c01e
commit 3961547bf5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java
View File

@ -511,15 +511,18 @@ public class NebulousAppDeployer {
// 6. Call deployApplication
// 7. call scaleIn endpoint with list of removed node names
String kubevelaString = "---\n# Did not manage to create rewritten KubeVela";
// ------------------------------------------------------------
// Rewrite KubeVela
JsonNode rewritten = createDeploymentKubevela(updatedKubevela);
String rewritten_kubevela = "---\n# Did not manage to create rewritten KubeVela";
try {
kubevelaString = yamlMapper.writeValueAsString(updatedKubevela);
rewritten_kubevela = yamlMapper.writeValueAsString(rewritten);
} catch (JsonProcessingException e) {
log.error("Failed to convert KubeVela to YAML; this should never happen", e);
app.setStateFailed();
return;
}
Main.logFile("redeploy-rewritten-kubevela-" + appUUID + ".yaml", kubevelaString);
Main.logFile("rewritten-kubevela-" + appUUID + ".yaml", rewritten_kubevela);
// ------------------------------------------------------------
// 1. Extract node requirements
@ -651,8 +654,8 @@ public class NebulousAppDeployer {
Main.logFile("redeploy-labelNodes-" + appUUID + ".json", nodeLabels.toPrettyString());
conn.labelNodes(appUUID, clusterName, nodeLabels);
log.info("Redeploying application: {}", kubevelaString);
conn.deployApplication(appUUID, clusterName, app.getName(), kubevelaString);
log.info("Redeploying application: {}", rewritten_kubevela);
conn.deployApplication(appUUID, clusterName, app.getName(), rewritten_kubevela);
if (!nodesToRemove.isEmpty()) {
Main.logFile("redeploy-scalein-" + appUUID + ".json", nodesToRemove);