apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deletion of Userdata / CNI Configuration in projects

Browse Source
This commit is contained in:
Pearl Dsilva 2024-07-08 07:58:06 -04:00 committed by nvazquez
parent 51d4403adf
commit 1dadd257a5
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -750,7 +750,7 @@ public class KubernetesClusterActionWorker {
try {
Thread.sleep(5 * 1000L);
} catch (InterruptedException ie) {
LOGGER.error(String.format("Error while attempting to taint nodes on Kubernetes cluster: %s", kubernetesCluster.getName()), ie);
logger.error(String.format("Error while attempting to taint nodes on Kubernetes cluster: %s", kubernetesCluster.getName()), ie);
}
retryCounter++;
}

2
server/src/main/java/com/cloud/api/ApiResponseHelper.java
View File

@ -5416,7 +5416,7 @@ public class ApiResponseHelper implements ResponseGenerator {
String rangeText = String.format("%s-%s", range.getStartASNumber(), range.getEndASNumber());
response.setAsNumberRange(rangeText);
} else {
s_logger.info("is null for as number: "+ asn.getAsNumber());
logger.info("is null for as number: "+ asn.getAsNumber());
}
response.setAllocated(asn.getAllocatedTime());
response.setAllocationState(asn.isAllocated() ? "Allocated" : "Free");

2
server/src/main/java/com/cloud/server/ManagementServerImpl.java
View File

@ -4999,7 +4999,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
return caller;
}
private SSHKeyPair createAndSaveSSHKeyPair(final String name, final String fingerprint, final String publicKey, final String privateKey, final Account owner) {
private SSHKeyPair createAndSaveSSHKeyPair(final String name, final String fingerprint, final String publicKey, final String privateKey, final Account owner) {
final SSHKeyPairVO newPair = new SSHKeyPairVO();
newPair.setAccountId(owner.getAccountId());

20
ui/src/config/section/compute.js
View File

@ -963,11 +963,14 @@ export default {
label: 'label.remove.user.data',
message: 'message.please.confirm.remove.user.data',
dataView: true,
args: ['id', 'account', 'domainid'],
args: ['id', 'account', 'domainid', 'projectid'],
mapping: {
id: {
value: (record, params) => { return record.id }
},
projectid: {
value: (record, params) => { return record.projectid }
},
account: {
value: (record, params) => { return record.account }
},
@ -981,7 +984,10 @@ export default {
return selection.map(x => {
const data = record.filter(y => { return y.id === x })
return {
id: x, account: data[0].account, domainid: data[0].domainid
id: x,
account: data[0].account,
domainid: data[0].domainid,
projectid: data[0].projectid
}
})
}
@ -1040,11 +1046,14 @@ export default {
label: 'label.remove.user.data',
message: 'message.please.confirm.remove.user.data',
dataView: true,
args: ['id', 'account', 'domainid'],
args: ['id', 'account', 'domainid', 'projectid'],
mapping: {
id: {
value: (record, params) => { return record.id }
},
projectid: {
value: (record, params) => { return record.projectid }
},
account: {
value: (record, params) => { return record.account }
},
@ -1058,7 +1067,10 @@ export default {
return selection.map(x => {
const data = record.filter(y => { return y.id === x })
return {
id: x, account: data[0].account, domainid: data[0].domainid
id: x,
account: data[0].account,
domainid: data[0].domainid,
projectid: data[0].projectid
}
})
}