mirror/QuickStack
1
0
Fork 0
mirror of https://github.com/biersoeckli/QuickStack.git synced 2026-01-02 09:41:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed issues in initservice

Browse Source
This commit is contained in:
biersoeckli
2024-11-21 14:20:02 +00:00
parent 6beaa3035c
commit dac0052f20
2 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/server/services/init.service.ts
View File

@@ -22,29 +22,42 @@ class InitService {
async createOrUpdateService(openNodePort = false) {
const serviceName = StringUtils.toServiceName(this.QUICKSTACK_DEPLOYMENT_NAME);
const body: V1Service = {
apiVersion: 'v1',
kind: 'Service',
metadata: {
name: StringUtils.toServiceName(this.QUICKSTACK_DEPLOYMENT_NAME)
name: serviceName,
namespace: this.QUICKSTACK_NAMESPACE,
},
spec: {
selector: {
app: this.QUICKSTACK_DEPLOYMENT_NAME
},
ports: [{
protocol: 'TCP',
port: 3000,
targetPort: 3000,
nodePort: openNodePort ? 3000 : undefined,
}]
ports: [
{
protocol: 'TCP',
port: 3000,
targetPort: 3000,
nodePort: openNodePort ? 30000 : undefined,
}
],
type: openNodePort ? 'NodePort' : undefined
}
};
const existingService = await k3s.core.readNamespacedService(serviceName, this.QUICKSTACK_NAMESPACE);
if (existingService.body) {
console.warn('Service already exists, updating');
return k3s.core.replaceNamespacedService(serviceName, this.QUICKSTACK_NAMESPACE, body);
const allServices = await k3s.core.listNamespacedService(this.QUICKSTACK_NAMESPACE);
const existingService = allServices.body.items.find(s => s.metadata!.name === serviceName);
if (existingService) {
console.warn('Service already exists, deleting and recreating it');
await k3s.core.deleteNamespacedService(serviceName, this.QUICKSTACK_NAMESPACE);
console.log('Existing service deleted');
//await k3s.core.replaceNamespacedService(serviceName, this.QUICKSTACK_NAMESPACE, body);
// console.log('Service created');
} else {
console.warn('Service does not exist, creating');
return k3s.core.createNamespacedService(this.QUICKSTACK_NAMESPACE, body);
}
await k3s.core.createNamespacedService(this.QUICKSTACK_NAMESPACE, body);
console.log('Service created');
}
@@ -67,13 +80,23 @@ class InitService {
}
}
};
const existingPvc = await k3s.core.readNamespacedPersistentVolumeClaim(pvcName, this.QUICKSTACK_NAMESPACE);
if (existingPvc.body) {
console.warn('PVC already exists, updating');
await k3s.core.replaceNamespacedPersistentVolumeClaim(pvcName, this.QUICKSTACK_NAMESPACE, pvc);
const allPvcs = await k3s.core.listNamespacedPersistentVolumeClaim(this.QUICKSTACK_NAMESPACE);
const existingPvc = allPvcs.body.items.find(p => p.metadata!.name === pvcName);
if (existingPvc) {
if (existingPvc.spec!.resources!.requests!.storage === pvc.spec!.resources!.requests!.storage) {
console.log(`PVC already exists with the same size, no changes`);
return;
}
console.warn('PVC already exists, updating size');
// Only the Size of PVC can be updated, so we need to delete and recreate the PVC
// update PVC size
existingPvc.spec!.resources!.requests!.storage = pvc.spec!.resources!.requests!.storage;
await k3s.core.replaceNamespacedPersistentVolumeClaim(pvcName, this.QUICKSTACK_NAMESPACE, existingPvc);
console.log('PVC updated');
} else {
console.warn('PVC does not exist, creating');
await k3s.core.createNamespacedPersistentVolumeClaim(this.QUICKSTACK_NAMESPACE, pvc);
console.log('PVC created');
}
}
@@ -124,11 +147,13 @@ class InitService {
}
private async deleteExistingDeployment() {
const existingDeployments = await k3s.apps.readNamespacedDeployment(this.QUICKSTACK_DEPLOYMENT_NAME, this.QUICKSTACK_NAMESPACE);
const quickStackAlreadyDeployed = !!existingDeployments.body;
const allDeployments = await k3s.apps.listNamespacedDeployment(this.QUICKSTACK_NAMESPACE);
const existingDeployments = allDeployments.body.items.find(d => d.metadata!.name === this.QUICKSTACK_DEPLOYMENT_NAME);
const quickStackAlreadyDeployed = !!existingDeployments;
if (quickStackAlreadyDeployed) {
console.warn('QuickStack already deployed, deleting existing deployment (data wont be lost)');
await k3s.apps.deleteNamespacedDeployment(this.QUICKSTACK_DEPLOYMENT_NAME, this.QUICKSTACK_NAMESPACE);
console.log('Existing deployment deleted');
}
}
}

10
src/server/utils/string.utils.ts
View File

@@ -25,17 +25,17 @@ export class StringUtils {
.toLowerCase(); // Convert to lowercase
}
static toProjectId(str: string): string {
static toProjectId(str: string): `proj-${string}` {
str = str.substring(0, StringUtils.MAX_OBJECT_NAME_LENGTH).trim();
return `proj-${StringUtils.toObjectId(str)}`;
}
static toAppId(str: string): string {
static toAppId(str: string): `app-${string}` {
str = str.substring(0, StringUtils.MAX_OBJECT_NAME_LENGTH).trim();
return `app-${StringUtils.toObjectId(str)}`;
}
static toJobName(appId: string) {
static toJobName(appId: string): `build-${string}` {
return `build-${appId}`;
}
@@ -45,7 +45,7 @@ export class StringUtils {
return `${str}-${randomString}`;
}
static toServiceName(appId: string) {
static toServiceName(appId: string): `svc-${string}` {
return `svc-${appId}`;
}
@@ -53,7 +53,7 @@ export class StringUtils {
return `pvc-${volumeId}`;
}
static getIngressName(domainId: string) {
static getIngressName(domainId: string): `ingress-${string}` {
return `ingress-${domainId}`;
}
}