feat: push config updates to coreflow
This commit is contained in:
@@ -139,6 +139,7 @@ export class ClusterManager {
|
||||
const clusterUser = new this.cloudlyRef.authManager.CUser({
|
||||
id: await this.cloudlyRef.authManager.CUser.getNewId(),
|
||||
data: {
|
||||
username: `cluster-${configObjectArg.id}`,
|
||||
role: 'cluster',
|
||||
type: 'machine',
|
||||
tokens: [
|
||||
@@ -151,9 +152,7 @@ export class ClusterManager {
|
||||
},
|
||||
});
|
||||
await clusterUser.save();
|
||||
Object.assign(configObjectArg, {
|
||||
userId: clusterUser.id,
|
||||
});
|
||||
configObjectArg.data.userId = clusterUser.id;
|
||||
const clusterInstance = await Cluster.fromConfigObject(configObjectArg);
|
||||
await clusterInstance.save();
|
||||
return clusterInstance;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import * as plugins from '../plugins.js';
|
||||
import { Cloudly } from '../classes.cloudly.js';
|
||||
import type { Cluster } from '../manager.cluster/classes.cluster.js';
|
||||
import { logger } from '../logger.js';
|
||||
|
||||
/**
|
||||
* in charge of talking to coreflow services on clusters
|
||||
@@ -35,14 +36,14 @@ export class CloudlyCoreflowManager {
|
||||
'The supplied token is not valid. The user is not a machine.'
|
||||
);
|
||||
}
|
||||
let cluster: Cluster;
|
||||
let cluster: Cluster | undefined;
|
||||
if (user.data.role === 'cluster') {
|
||||
cluster = await this.cloudlyRef.clusterManager.getClusterBy_UserId(user.id);
|
||||
}
|
||||
const expiryTimestamp = Date.now() + 3600 * 1000 * 24 * 365;
|
||||
return {
|
||||
identity: {
|
||||
name: user.data.username,
|
||||
name: user.data.username || user.id,
|
||||
role: user.data.role,
|
||||
type: 'machine', // if someone authenticates by token, they are a machine, no matter what.
|
||||
userId: user.id,
|
||||
@@ -71,16 +72,9 @@ export class CloudlyCoreflowManager {
|
||||
const identity = dataArg.identity;
|
||||
console.log('trying to get clusterConfigSet');
|
||||
console.log(dataArg);
|
||||
const cluster = await this.cloudlyRef.clusterManager.getClusterBy_Identity(identity);
|
||||
const services = await this.cloudlyRef.serviceManager.CService.getInstances({});
|
||||
const platformDesiredState = await this.cloudlyRef.platformManager.getPlatformDesiredState();
|
||||
const clusterConfig = await this.getClusterConfigPayloadForIdentity(identity);
|
||||
console.log('got cluster config and sending it back to coreflow');
|
||||
return {
|
||||
configData: await cluster.createSavableObject(),
|
||||
services: await Promise.all(services.map((service) => service.createSavableObject())),
|
||||
platformProviderConfigs: platformDesiredState.providerConfigs,
|
||||
platformBindings: platformDesiredState.bindings,
|
||||
};
|
||||
return clusterConfig;
|
||||
}
|
||||
)
|
||||
);
|
||||
@@ -102,4 +96,49 @@ export class CloudlyCoreflowManager {
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public async getClusterConfigPayloadForIdentity(
|
||||
identityArg: plugins.servezoneInterfaces.data.IIdentity,
|
||||
): Promise<plugins.servezoneInterfaces.requests.config.IRequest_Cloudly_Coreflow_PushClusterConfig['request']> {
|
||||
const cluster = await this.cloudlyRef.clusterManager.getClusterBy_Identity(identityArg);
|
||||
const services = await this.cloudlyRef.serviceManager.CService.getInstances({});
|
||||
const platformDesiredState = await this.cloudlyRef.platformManager.getPlatformDesiredState();
|
||||
return {
|
||||
configData: await cluster.createSavableObject(),
|
||||
services: await Promise.all(services.map((service) => service.createSavableObject())),
|
||||
platformProviderConfigs: platformDesiredState.providerConfigs,
|
||||
platformBindings: platformDesiredState.bindings,
|
||||
};
|
||||
}
|
||||
|
||||
public async pushClusterConfigToConnectedCoreflows() {
|
||||
const typedsocket = this.cloudlyRef.server.typedServer?.typedsocket;
|
||||
if (!typedsocket) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
const connections = await typedsocket.findAllTargetConnections(async (connectionArg) => {
|
||||
const identityTag = await connectionArg.getTagById('identity');
|
||||
const identity = identityTag?.payload as plugins.servezoneInterfaces.data.IIdentity | undefined;
|
||||
return identity?.role === 'cluster' && !!identity.userId;
|
||||
});
|
||||
|
||||
await Promise.all(
|
||||
connections.map(async (connectionArg) => {
|
||||
const identityTag = await connectionArg.getTagById('identity');
|
||||
const identity = identityTag?.payload as plugins.servezoneInterfaces.data.IIdentity;
|
||||
try {
|
||||
const pushClusterConfig = typedsocket.createTypedRequest<plugins.servezoneInterfaces.requests.config.IRequest_Cloudly_Coreflow_PushClusterConfig>(
|
||||
'pushClusterConfig',
|
||||
connectionArg,
|
||||
);
|
||||
await pushClusterConfig.fire(await this.getClusterConfigPayloadForIdentity(identity));
|
||||
} catch (error) {
|
||||
logger.log('error', `failed to push cluster config to coreflow ${identity.userId}: ${(error as Error).message}`);
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
||||
return connections.length;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -193,6 +193,9 @@ export class CloudlyRegistryManager {
|
||||
await service.save();
|
||||
|
||||
await this.recordImagePushEvent(service, pushEvent);
|
||||
if (service.data.deployOnPush !== false) {
|
||||
await this.cloudlyRef.coreflowManager.pushClusterConfigToConnectedCoreflows();
|
||||
}
|
||||
logger.log('info', `recorded registry push ${repositoryArg}:${tagArg} -> ${digestArg}`);
|
||||
}
|
||||
|
||||
|
||||
@@ -100,6 +100,7 @@ export class ServiceManager {
|
||||
service.data.imageVersion || 'latest',
|
||||
);
|
||||
await service.save();
|
||||
await this.cloudlyRef.coreflowManager.pushClusterConfigToConnectedCoreflows();
|
||||
return {
|
||||
service: await service.createSavableObject(),
|
||||
};
|
||||
@@ -123,6 +124,7 @@ export class ServiceManager {
|
||||
service.data.imageVersion || 'latest',
|
||||
);
|
||||
await service.save();
|
||||
await this.cloudlyRef.coreflowManager.pushClusterConfigToConnectedCoreflows();
|
||||
return {
|
||||
service: await service.createSavableObject(),
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user