removed storageclass specs
This commit is contained in:
@@ -32,7 +32,6 @@ data:
|
|||||||
in_cluster: true
|
in_cluster: true
|
||||||
sandbox_image: git.dxod.org/dexorder/dexorder/ai-sandbox:latest
|
sandbox_image: git.dxod.org/dexorder/dexorder/ai-sandbox:latest
|
||||||
sidecar_image: git.dxod.org/dexorder/dexorder/ai-lifecycle-sidecar:latest
|
sidecar_image: git.dxod.org/dexorder/dexorder/ai-lifecycle-sidecar:latest
|
||||||
storage_class: standard
|
|
||||||
image_pull_policy: Always
|
image_pull_policy: Always
|
||||||
|
|
||||||
# DragonflyDB (Redis-compatible, for hot storage and session management)
|
# DragonflyDB (Redis-compatible, for hot storage and session management)
|
||||||
|
|||||||
@@ -123,14 +123,13 @@ export class KubernetesClient {
|
|||||||
const templateContent = await fs.readFile(templatePath, 'utf-8');
|
const templateContent = await fs.readFile(templatePath, 'utf-8');
|
||||||
|
|
||||||
const r = spec.k8sResources;
|
const r = spec.k8sResources;
|
||||||
const rendered = templateContent
|
let rendered = templateContent
|
||||||
.replace(/\{\{userId\}\}/g, spec.userId)
|
.replace(/\{\{userId\}\}/g, spec.userId)
|
||||||
.replace(/\{\{deploymentName\}\}/g, deploymentName)
|
.replace(/\{\{deploymentName\}\}/g, deploymentName)
|
||||||
.replace(/\{\{serviceName\}\}/g, serviceName)
|
.replace(/\{\{serviceName\}\}/g, serviceName)
|
||||||
.replace(/\{\{pvcName\}\}/g, pvcName)
|
.replace(/\{\{pvcName\}\}/g, pvcName)
|
||||||
.replace(/\{\{sandboxImage\}\}/g, spec.sandboxImage)
|
.replace(/\{\{sandboxImage\}\}/g, spec.sandboxImage)
|
||||||
.replace(/\{\{sidecarImage\}\}/g, spec.sidecarImage)
|
.replace(/\{\{sidecarImage\}\}/g, spec.sidecarImage)
|
||||||
.replace(/\{\{storageClass\}\}/g, spec.storageClass)
|
|
||||||
.replace(/\{\{imagePullPolicy\}\}/g, spec.imagePullPolicy || 'Always')
|
.replace(/\{\{imagePullPolicy\}\}/g, spec.imagePullPolicy || 'Always')
|
||||||
.replace(/\{\{licenseType\}\}/g, spec.licenseType)
|
.replace(/\{\{licenseType\}\}/g, spec.licenseType)
|
||||||
.replace(/\{\{memoryRequest\}\}/g, r.memoryRequest)
|
.replace(/\{\{memoryRequest\}\}/g, r.memoryRequest)
|
||||||
@@ -143,6 +142,13 @@ export class KubernetesClient {
|
|||||||
.replace(/\{\{idleTimeoutMinutes\}\}/g, String(r.idleTimeoutMinutes))
|
.replace(/\{\{idleTimeoutMinutes\}\}/g, String(r.idleTimeoutMinutes))
|
||||||
.replace(/\{\{serviceNamespace\}\}/g, spec.serviceNamespace);
|
.replace(/\{\{serviceNamespace\}\}/g, spec.serviceNamespace);
|
||||||
|
|
||||||
|
// Omit storageClassName entirely when unset so the PVC uses the cluster default
|
||||||
|
if (spec.storageClass) {
|
||||||
|
rendered = rendered.replace(/\{\{storageClass\}\}/g, spec.storageClass);
|
||||||
|
} else {
|
||||||
|
rendered = rendered.replace(/[ \t]*storageClassName: \{\{storageClass\}\}\n/g, '');
|
||||||
|
}
|
||||||
|
|
||||||
// Parse YAML documents (deployment, pvc, service)
|
// Parse YAML documents (deployment, pvc, service)
|
||||||
const documents = yaml.loadAll(rendered) as any[];
|
const documents = yaml.loadAll(rendered) as any[];
|
||||||
|
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ function loadConfig() {
|
|||||||
context: configData.kubernetes?.context || process.env.KUBERNETES_CONTEXT,
|
context: configData.kubernetes?.context || process.env.KUBERNETES_CONTEXT,
|
||||||
sandboxImage: configData.kubernetes?.sandbox_image || process.env.SANDBOX_IMAGE || 'ghcr.io/dexorder/sandbox:latest',
|
sandboxImage: configData.kubernetes?.sandbox_image || process.env.SANDBOX_IMAGE || 'ghcr.io/dexorder/sandbox:latest',
|
||||||
sidecarImage: configData.kubernetes?.sidecar_image || process.env.SIDECAR_IMAGE || 'ghcr.io/dexorder/lifecycle-sidecar:latest',
|
sidecarImage: configData.kubernetes?.sidecar_image || process.env.SIDECAR_IMAGE || 'ghcr.io/dexorder/lifecycle-sidecar:latest',
|
||||||
storageClass: configData.kubernetes?.storage_class || process.env.SANDBOX_STORAGE_CLASS || 'standard',
|
storageClass: configData.kubernetes?.storage_class || process.env.SANDBOX_STORAGE_CLASS || '',
|
||||||
imagePullPolicy: configData.kubernetes?.image_pull_policy || process.env.IMAGE_PULL_POLICY || 'Always',
|
imagePullPolicy: configData.kubernetes?.image_pull_policy || process.env.IMAGE_PULL_POLICY || 'Always',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user