nebulous/optimiser-controller
Code Issues Proposed changes

Further regularization of node names

Browse Source 
Lowercase everything, then convert all non-alphanumeric characters
except hyphen to hyphen.

Change-Id: I08ff4efe650e64e69900f0e298e78d85c5b7e50e
This commit is contained in:
Rudi Schlatte 2024-04-04 17:05:19 +02:00
parent e17447f816
commit a6901aa327
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,17 +103,27 @@ public class NebulousAppDeployer {
/** /**
* Create a globally-unique node name. The node name has to conform to * Create a globally-unique node name. The node name has to conform to
* Linux hostname rules: lowercase letters, numbers and underscore only, * Linux hostname rules: lowercase letters, numbers and hyphens only,
* starting with a letter. * starting with a letter.
* *
* <p>NOTE: if the application includes components whose names only differ
* by case or underscore vs hyphen, this method might not create unique
* node names, which will lead to failure during cluster creation.
*
* @param clusterName the unique cluster name. * @param clusterName the unique cluster name.
* @param componentName the KubeVela component name. * @param componentName the KubeVela component name.
* @param deployGeneration 1 for initial deployment, increasing for each redeployment. * @param deployGeneration 1 for initial deployment, increasing for each
* @param nodeNumber the replica number of the component to be deployed on the node. * redeployment.
* @return a fresh node name. * @param nodeNumber the replica number of the component to be deployed on
* the node.
* @return a node name, unique if componentNames are "sufficiently unique"
* (see above).
*/ */
private static String createNodeName(String clusterName, String componentName, int deployGeneration, int nodeNumber) { public static String createNodeName(String clusterName, String componentName, int deployGeneration, int nodeNumber) {
return String.format("n%s-%s-%s-%s", clusterName.toLowerCase(), componentName.toLowerCase(), deployGeneration, nodeNumber); String nodename = String.format("n%s-%s-%s-%s", clusterName, componentName, deployGeneration, nodeNumber);
nodename = nodename.toLowerCase();
nodename = nodename.replaceAll("[^a-z0-9-]", "-");
return nodename;
} }
/** /**