refactor(cloudly): consume external interfaces package
This commit is contained in:
@@ -6,8 +6,12 @@ export const demoImages: plugins.servezoneInterfaces.data.IImage[] = [
|
||||
data: {
|
||||
name: 'DemoImage1',
|
||||
description: 'DemoImage1',
|
||||
location: {
|
||||
internal: true,
|
||||
externalRegistryId: '',
|
||||
externalImageTag: '',
|
||||
},
|
||||
versions: [],
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ export class CloudlyAuthManager {
|
||||
}
|
||||
|
||||
this.typedrouter.addTypedHandler(
|
||||
new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.requests.secret.IReq_Admin_LoginWithUsernameAndPassword>(
|
||||
new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.requests.admin.IReq_Admin_LoginWithUsernameAndPassword>(
|
||||
'adminLoginWithUsernameAndPassword',
|
||||
async (dataArg) => {
|
||||
let jwt: string;
|
||||
|
||||
@@ -305,8 +305,13 @@ export class DeploymentManager {
|
||||
const node = await this.cloudlyRef.nodeManager.CClusterNode.getInstance({
|
||||
id: nodeId,
|
||||
});
|
||||
if (node && node.data.publicIp) {
|
||||
await this.cloudlyRef.dnsManager.updateServiceDnsEntriesIp(serviceId, node.data.publicIp);
|
||||
if (node?.data.baremetalId) {
|
||||
const baremetal = await this.cloudlyRef.baremetalManager.CBareMetal.getInstance({
|
||||
id: node.data.baremetalId,
|
||||
});
|
||||
if (baremetal?.data.primaryIp) {
|
||||
await this.cloudlyRef.dnsManager.updateServiceDnsEntriesIp(serviceId, baremetal.data.primaryIp);
|
||||
}
|
||||
}
|
||||
|
||||
return deployment;
|
||||
@@ -321,4 +326,4 @@ export class DeploymentManager {
|
||||
// Cleanup if needed
|
||||
console.log('DeploymentManager stopped');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ export class CloudlyNodeManager {
|
||||
* is used be serverconfig module on the node to get the actual node config
|
||||
*/
|
||||
this.typedRouter.addTypedHandler(
|
||||
new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.requests.config.IRequest_Any_Cloudly_GetNodeConfig>(
|
||||
new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.requests.node.IRequest_Any_Cloudly_GetNodeConfig>(
|
||||
'getNodeConfig',
|
||||
async (requestData) => {
|
||||
const nodeId = requestData.nodeId;
|
||||
|
||||
@@ -361,7 +361,7 @@ export function createPredefinedTasks(taskManager: CloudlyTaskManager) {
|
||||
// TODO: Get actual resource usage
|
||||
const nodeUsage = {
|
||||
nodeId: node.id,
|
||||
nodeName: node.data.name,
|
||||
nodeName: node.data.swarmNodeId || node.id,
|
||||
cpu: Math.random() * 100, // Placeholder
|
||||
memory: Math.random() * 100, // Placeholder
|
||||
disk: Math.random() * 100, // Placeholder
|
||||
@@ -477,7 +477,7 @@ export function createPredefinedTasks(taskManager: CloudlyTaskManager) {
|
||||
type: 'outdated-image',
|
||||
severity: 'medium',
|
||||
image: image.data.name,
|
||||
version: image.data.version,
|
||||
version: image.data.versions[0]?.versionString || 'unknown',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user