@hed-hog/cli 0.0.79 → 0.0.80

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hed-hog/cli",
-    "version": "0.0.79",
+    "version": "0.0.80",
     "description": "HedHog CLI tool",
     "author": "HedHog",
     "private": false,

package/dist/src/modules/developer/developer.service.d.ts

@@ -66,7 +66,7 @@ export declare class DeveloperService {
     private parseDotEnv;
     private getAppEnvVariables;
     private isPostgresService;
-    private generatePostgresStatefulSetManifests;
+    private generatePostgresHelmChart;
     private generateIngressManifest;
     private generateCertManagerIssuer;
     private generateDeploymentReadme;

package/dist/src/modules/developer/developer.service.js

@@ -1365,8 +1365,8 @@ CMD ["sh", "-c", "${startCmd}"]
         if (config.setupSSL) {
             await this.generateCertManagerIssuer(k8sDir, config);
         }
-        // Generate PostgreSQL StatefulSet manifest for postgres infra service
-        await this.generatePostgresStatefulSetManifests(k8sDir, config);
+        // Generate dedicated Helm chart for postgres infra service
+        await this.generatePostgresHelmChart(path, config);
         // Generate optional Helm charts for detected docker-compose services
         await this.generateComposeServiceHelmCharts(path, config);
         // Generate README with deployment instructions
@@ -1402,6 +1402,9 @@ CMD ["sh", "-c", "${startCmd}"]
         const servicesRoot = pathModule.join(path, 'helm', 'services');
         await (0, promises_1.mkdir)(servicesRoot, { recursive: true });
         for (const service of infraServices) {
+            if (this.isPostgresService(service)) {
+                continue;
+            }
             const chartDir = pathModule.join(servicesRoot, service.name);
             const templatesDir = pathModule.join(chartDir, 'templates');
             await (0, promises_1.mkdir)(templatesDir, { recursive: true });
@@ -1534,38 +1537,59 @@ temp
         const imageName = String(service?.image || '').toLowerCase();
         return serviceName.includes('postgres') || imageName.includes('postgres');
     }
-    async generatePostgresStatefulSetManifests(k8sDir, config) {
+    async generatePostgresHelmChart(path, config) {
         const infraServices = (config.infraServices || []);
         const postgresService = infraServices.find((service) => this.isPostgresService(service));
         if (!postgresService) {
             return;
         }
-        const postgresDir = pathModule.join(k8sDir, 'postgres');
-        await (0, promises_1.mkdir)(postgresDir, { recursive: true });
-        const templatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'k8s.postgres.statefulset.yaml.ejs');
-        const templateContent = await (0, promises_1.readFile)(templatePath, 'utf8');
-        const statefulSetContent = await (0, ejs_1.render)(templateContent, {
+        const postgresDir = pathModule.join(path, 'helm', 'services', 'postgres');
+        const templatesDir = pathModule.join(postgresDir, 'templates');
+        await (0, promises_1.mkdir)(templatesDir, { recursive: true });
+        const servicePort = postgresService.containerPort ||
+            this.getDefaultServicePort(postgresService.name);
+        const chartTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'helm.postgres.chart.yaml.ejs');
+        const valuesTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'helm.postgres.values.yaml.ejs');
+        const headlessServiceTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'helm.postgres.headless-service.yaml.ejs');
+        const pvcTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'helm.postgres.pvc.yaml.ejs');
+        const secretTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'helm.postgres.secret.yaml.ejs');
+        const serviceTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'helm.postgres.service.yaml.ejs');
+        const statefulSetTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'helm.postgres.statefulset.yaml.ejs');
+        const renderContext = {
             config,
             service: postgresService,
+            servicePort,
             postgresDbName: config.appName,
+        };
+        const chartYaml = await (0, ejs_1.render)(await (0, promises_1.readFile)(chartTemplatePath, 'utf8'), {
+            ...renderContext,
         });
-        await (0, promises_1.writeFile)(pathModule.join(postgresDir, 'statefulset.yaml'), this.normalizeYamlContent(statefulSetContent, 'k8s/postgres/statefulset.yaml'), 'utf8');
-        const serviceTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'k8s.postgres.service.yaml.ejs');
-        const serviceTemplateContent = await (0, promises_1.readFile)(serviceTemplatePath, 'utf8');
-        const serviceContent = await (0, ejs_1.render)(serviceTemplateContent, {
-            config,
+        const valuesYaml = await (0, ejs_1.render)(await (0, promises_1.readFile)(valuesTemplatePath, 'utf8'), {
+            ...renderContext,
         });
-        await (0, promises_1.writeFile)(pathModule.join(postgresDir, 'service.yaml'), this.normalizeYamlContent(serviceContent, 'k8s/postgres/service.yaml'), 'utf8');
-        const readmeTemplatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'k8s.postgres.readme.ms.ejs');
-        const readmeTemplateContent = await (0, promises_1.readFile)(readmeTemplatePath, 'utf8');
-        const readmeContent = await (0, ejs_1.render)(readmeTemplateContent, {
-            config,
-            postgresDbName: config.appName,
-            postgresResourceName: `postgresql-${config.appName}`,
-            k8sClusterId: config.k8sClusterId || config.clusterName,
+        const headlessServiceYaml = await (0, ejs_1.render)(await (0, promises_1.readFile)(headlessServiceTemplatePath, 'utf8'), {
+            ...renderContext,
         });
-        await (0, promises_1.writeFile)(pathModule.join(postgresDir, 'README.ms'), readmeContent, 'utf8');
-        this.log(chalk.green('Created PostgreSQL Kubernetes manifests and README'));
+        const pvcYaml = await (0, ejs_1.render)(await (0, promises_1.readFile)(pvcTemplatePath, 'utf8'), {
+            ...renderContext,
+        });
+        const secretYaml = await (0, ejs_1.render)(await (0, promises_1.readFile)(secretTemplatePath, 'utf8'), {
+            ...renderContext,
+        });
+        const serviceYaml = await (0, ejs_1.render)(await (0, promises_1.readFile)(serviceTemplatePath, 'utf8'), {
+            ...renderContext,
+        });
+        const statefulSetYaml = await (0, ejs_1.render)(await (0, promises_1.readFile)(statefulSetTemplatePath, 'utf8'), {
+            ...renderContext,
+        });
+        await (0, promises_1.writeFile)(pathModule.join(postgresDir, 'Chart.yaml'), this.normalizeYamlContent(chartYaml, 'helm/services/postgres/Chart.yaml'), 'utf8');
+        await (0, promises_1.writeFile)(pathModule.join(postgresDir, 'values.yaml'), this.normalizeYamlContent(valuesYaml, 'helm/services/postgres/values.yaml'), 'utf8');
+        await (0, promises_1.writeFile)(pathModule.join(templatesDir, 'headless-service.yaml'), headlessServiceYaml, 'utf8');
+        await (0, promises_1.writeFile)(pathModule.join(templatesDir, 'pvc.yaml'), pvcYaml, 'utf8');
+        await (0, promises_1.writeFile)(pathModule.join(templatesDir, 'secret.yaml'), secretYaml, 'utf8');
+        await (0, promises_1.writeFile)(pathModule.join(templatesDir, 'service.yaml'), serviceYaml, 'utf8');
+        await (0, promises_1.writeFile)(pathModule.join(templatesDir, 'statefulset.yaml'), statefulSetYaml, 'utf8');
+        this.log(chalk.green('Created PostgreSQL Helm chart files'));
     }
     async generateIngressManifest(dir, config) {
         const templatePath = pathModule.join(__dirname, '..', '..', 'templates', 'deployment', 'k8s.ingress.yaml.ejs');
@@ -1640,12 +1664,17 @@ temp
             console.log(chalk.gray('  k8s/cert-manager-issuer.yaml'));
         }
         if (hasPostgresInfra) {
-            console.log(chalk.gray('  k8s/postgres/service.yaml'));
-            console.log(chalk.gray('  k8s/postgres/statefulset.yaml'));
-            console.log(chalk.gray('  k8s/postgres/README.ms'));
-        }
-        if ((config.infraServices || []).length > 0) {
-            config.infraServices.forEach((service) => {
+            console.log(chalk.gray('  helm/services/postgres/Chart.yaml'));
+            console.log(chalk.gray('  helm/services/postgres/values.yaml'));
+            console.log(chalk.gray('  helm/services/postgres/templates/headless-service.yaml'));
+            console.log(chalk.gray('  helm/services/postgres/templates/pvc.yaml'));
+            console.log(chalk.gray('  helm/services/postgres/templates/secret.yaml'));
+            console.log(chalk.gray('  helm/services/postgres/templates/service.yaml'));
+            console.log(chalk.gray('  helm/services/postgres/templates/statefulset.yaml'));
+        }
+        const nonPostgresInfraServices = (config.infraServices || []).filter((service) => !this.isPostgresService(service));
+        if (nonPostgresInfraServices.length > 0) {
+            nonPostgresInfraServices.forEach((service) => {
                 console.log(chalk.gray(`  helm/services/${service.name}/Chart.yaml`));
                 console.log(chalk.gray(`  helm/services/${service.name}/values.yaml`));
                 console.log(chalk.gray(`  helm/services/${service.name}/templates/deployment.yaml`));
@@ -1658,10 +1687,13 @@ temp
         console.log(chalk.white('2. Read DEPLOYMENT.md for setup instructions'));
         console.log(chalk.white('3. Configure GitHub secrets now with this CLI or follow DEPLOYMENT.md'));
         console.log(chalk.white(`4. Push to ${config.deployBranch || 'production'} branch to trigger deployment`));
-        if ((config.infraServices || []).length > 0) {
+        if (hasPostgresInfra || nonPostgresInfraServices.length > 0) {
             console.log('');
             console.log(chalk.blue.bold('ℹ Additional service charts were generated only (not applied):'));
-            config.infraServices.forEach((service) => {
+            if (hasPostgresInfra) {
+                console.log(chalk.white(`   helm upgrade --install postgres ./helm/services/postgres --namespace ${config.namespace} --create-namespace`));
+            }
+            nonPostgresInfraServices.forEach((service) => {
                 console.log(chalk.white(`   helm upgrade --install ${service.name} ./helm/services/${service.name} --namespace ${config.namespace} --create-namespace`));
             });
         }