timonel 2.9.2 → 2.10.0

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+# [2.10.0](https://github.com/KenkoGeek/timonel/compare/v2.9.2...v2.10.0) (2025-09-20)
+
+### Bug Fixes
+
+- **ci:** and beside or ([2901953](https://github.com/KenkoGeek/timonel/commit/2901953363ff81c03ad95e57fbf61129bffe4138))
+- **ci:** change CodeQL build-mode to 'none' for JavaScript/TypeScript ([017ec93](https://github.com/KenkoGeek/timonel/commit/017ec930940780fca9e6f93e02372067f899675f))
+- **ci:** clean up workflows and fix CodeQL configuration ([4c3ac55](https://github.com/KenkoGeek/timonel/commit/4c3ac55e04210d77ad694aef1fab261482a7f5e9))
+- **ci:** correct CodeQL workflow configuration ([25813d3](https://github.com/KenkoGeek/timonel/commit/25813d3b4ce649da5fa3b1cf29f825369c17b196))
+- **ci:** correct CodeQL workflow name in release.yaml ([cb38608](https://github.com/KenkoGeek/timonel/commit/cb3860881b527f5016dcdc891f848c22ea464868))
+- **ci:** correct job dependencies and summary references ([d37cc9c](https://github.com/KenkoGeek/timonel/commit/d37cc9ccf05407f28b85bd7eeb5710b2460b72ef))
+- **ci:** ensure real release on main branch ([c06a5f7](https://github.com/KenkoGeek/timonel/commit/c06a5f7f9d0d45261c95e677f04382e0e20de58d))
+- **ci:** lint errors ([08fbb64](https://github.com/KenkoGeek/timonel/commit/08fbb645b3661a2bc4e6bf33b309ab88cd707fef))
+- **ci:** remove explicit pnpm version from CodeQL workflow ([25a8a6c](https://github.com/KenkoGeek/timonel/commit/25a8a6cd9556ae614bb84bfcc147aadb17850f48))
+- **ci:** remove explicit pnpm version from workflows ([b517e1e](https://github.com/KenkoGeek/timonel/commit/b517e1eb35b3ab57673428c7d80fa25d427bf046))
+- **ci:** reorder pnpm setup before Node.js in CodeQL workflow ([904579c](https://github.com/KenkoGeek/timonel/commit/904579ca507ef2cad5f11887e35431e6a15a59f5))
+- **ci:** resolve pnpm version conflict in workflows ([a2ee153](https://github.com/KenkoGeek/timonel/commit/a2ee153934c5710e58f8e5bd85da6ea70e1c8959))
+- **ci:** simple but effective release ([a6b2014](https://github.com/KenkoGeek/timonel/commit/a6b201476903cedf8e1d1dd7bbf36c2f02fa750b))
+- **ci:** simple but effective release, security.md updated ([6911d21](https://github.com/KenkoGeek/timonel/commit/6911d2131971787d8afce1123ed4969e0ae8e077))
+- **ci:** use exact pnpm version 10.15.0 in workflows ([2634e7d](https://github.com/KenkoGeek/timonel/commit/2634e7d30b58dcea182605a52a1e34daca0cf6bb))
+- **core:** correct TypeScript errors and improve version handling ([3945d8b](https://github.com/KenkoGeek/timonel/commit/3945d8b6e3f84141579e0a08b48bdfd480e64168))
+- **core:** resolve issue [#114](https://github.com/KenkoGeek/timonel/issues/114) - invalid Helm template generation ([eac0bdb](https://github.com/KenkoGeek/timonel/commit/eac0bdbbe4946e0dcf29346b956451f4d1f4a016))
+- **docs:** apply prettier formatting to README.md ([0ad15aa](https://github.com/KenkoGeek/timonel/commit/0ad15aa8add475268b6b7c9af9bdcd3b6a82bb80))
+- **release:** align required checks with ruleset configuration ([1b4d1dd](https://github.com/KenkoGeek/timonel/commit/1b4d1dd245974f80d3fb00096d48dbaaa79419f1))
+- **release:** update required checks in release workflow ([1811247](https://github.com/KenkoGeek/timonel/commit/1811247fa1562885b8bd43909bd2127e23de225d))
+- resolve issue [#114](https://github.com/KenkoGeek/timonel/issues/114) - Helm template generation bug and enhance documentation ([#116](https://github.com/KenkoGeek/timonel/issues/116)) ([92782f8](https://github.com/KenkoGeek/timonel/commit/92782f840571e036cc235d1b7739b00d8ac8d56c))
+- **umbrella:** remove unused \_subchartInstance variables ([73b3a8a](https://github.com/KenkoGeek/timonel/commit/73b3a8a99b30ef4576f60331f66b30164bd8213e))
+
+### Features
+
+- **ci:** optimize GitHub workflows with enhanced performance and reliability ([09d0470](https://github.com/KenkoGeek/timonel/commit/09d04700b011e8dc4ae3875c4a46d835b88bb13d)), closes [#114](https://github.com/KenkoGeek/timonel/issues/114)
+- **core:** enhance ChartProps for better flexibility ([385f966](https://github.com/KenkoGeek/timonel/commit/385f96607c27a1dd58ff8e4ceb60d8a56ece8422))
+
+### Reverts
+
+- **ci:** restore original release workflow ([f2f9b27](https://github.com/KenkoGeek/timonel/commit/f2f9b27e1950e8c9496f0faf6b874c0be5ad02e9))
+
 ## [2.9.2](https://github.com/KenkoGeek/timonel/compare/v2.9.1...v2.9.2) (2025-09-19)
 
 ### Bug Fixes

package/README.md

@@ -10,39 +10,141 @@
 [![TypeScript][ts-badge]][ts-url]
 [![Maintained by KenkoGeek][maintained-badge]][maintained-url]
 
-Timonel (Spanish for "helmsman") is a TypeScript library to programmatically generate Helm charts
-using cdk8s. Define Kubernetes resources with classes and synthesize a full Helm chart with
-`Chart.yaml`, `values.yaml`, per‑environment values files, and `templates/`.
+**Timonel** (Spanish for "helmsman") is a powerful TypeScript library that programmatically generates
+Helm charts using cdk8s. Define Kubernetes resources with type-safe classes and synthesize complete
+Helm charts with `Chart.yaml`, `values.yaml`, environment-specific values files, and `templates/`
+directory.
+
+> 🚀 **New in v2.9.2**: Enhanced umbrella chart support with flexible subchart templates, improved
+> CLI version handling, and optimized GitHub workflows.
 
 ## ✨ Key Features
 
-- **Type-safe API** with strict TypeScript and cdk8s constructs.
-- **Flexible resource creation** with built-in methods and `addManifest()` for custom resources.
-- **Multi-environment support** with automatic values files generation.
-- **Umbrella Charts** for managing multiple subcharts as a single unit.
-- **AWS integrations**:
-  - **AWS**: EBS/EFS StorageClass, ALB Ingress, IRSA ServiceAccount.
-- **Security-first approach** with NetworkPolicies and best practices.
-- **Minimal CLI** (`tl`) for scaffolding and chart generation.
+- **🔒 Type-safe API** with strict TypeScript and cdk8s constructs
+- **🔧 Flexible resource creation** with built-in methods and `addManifest()` for custom resources
+- **🌍 Multi-environment support** with automatic values files generation
+- **☂️ Umbrella Charts** for managing multiple subcharts as a single unit
+- **☁️ Cloud integrations**:
+  - **AWS**: EBS/EFS StorageClass, ALB Ingress, IRSA ServiceAccount
+  - **Azure**: Azure Disk, Azure Files, AKS integrations
+  - **GCP**: GCE Persistent Disk, GKE integrations
+- **🛡️ Security-first approach** with NetworkPolicies and best practices
+- **⚡ Minimal CLI** (`tl`) for scaffolding and chart generation
+- **📦 Flexible subchart templates** supporting cdk8s, cdk8s-plus-33, and raw manifests
 
 ## 🚀 Quick Start
 
+### Installation
+
 ```bash
 # Install Timonel globally
 npm install -g timonel
 
+# Or use with pnpm
+pnpm add -g timonel
+
+# Verify installation
+tl --version
+```
+
+### Basic Usage
+
+```bash
 # Create your first chart
 tl init my-app
 
 # Generate Helm chart
-tl synth charts/my-app charts/my-app-dist
+tl synth my-app my-app-dist
 
 # Use with Helm
-helm install my-app charts/my-app-dist
+helm install my-app my-app-dist
+```
+
+### Umbrella Charts
+
+```bash
+# Create umbrella chart structure
+tl umbrella init my-umbrella-app
+
+# Add subcharts
+tl umbrella add frontend
+tl umbrella add backend
+
+# Generate umbrella chart
+tl umbrella synth
+```
+
+## 💡 Examples
+
+### Simple Web Application
+
+```typescript
+import { Chart } from 'cdk8s';
+import { Deployment, Service } from 'cdk8s-plus-33';
+
+export class WebAppChart extends Chart {
+  constructor(scope: Chart, id: string) {
+    super(scope, id);
+
+    // Create deployment
+    new Deployment(this, 'web-deployment', {
+      containers: [
+        {
+          image: 'nginx:latest',
+          port: 80,
+          env: {
+            NGINX_PORT: '80',
+          },
+        },
+      ],
+    });
+
+    // Create service
+    new Service(this, 'web-service', {
+      selector: { app: 'web' },
+      ports: [{ port: 80, targetPort: 80 }],
+    });
+  }
+}
+```
+
+### Umbrella Chart with Multiple Services
+
+```typescript
+import { UmbrellaChartTemplate } from 'timonel';
+
+const umbrellaConfig = {
+  name: 'my-umbrella-app',
+  version: '1.0.0',
+  subcharts: [
+    {
+      name: 'frontend',
+      version: '1.0.0',
+      chart: frontendChartFunction,
+    },
+    {
+      name: 'backend',
+      version: '1.0.0',
+      chart: backendChartFunction,
+    },
+  ],
+};
+
+export const umbrella = new UmbrellaChartTemplate(umbrellaConfig);
 ```
 
 ## 📚 Documentation
 
+- **[API Reference](https://github.com/KenkoGeek/timonel/wiki/API-Reference)** - Complete API
+  documentation
+- **[CLI Reference](https://github.com/KenkoGeek/timonel/wiki/CLI-Reference)** - Command-line
+  interface guide
+- **[Examples](https://github.com/KenkoGeek/timonel/wiki/Examples)** - Real-world usage examples
+- **[Best Practices](https://github.com/KenkoGeek/timonel/wiki/Best-Practices)** - Recommended
+  patterns and practices
+- **[Contributing](https://github.com/KenkoGeek/timonel/wiki/Contributing)** - Development setup
+  and guidelines
+
 ## 🔧 Troubleshooting
 
 ### CDK8s Module Not Found Error
@@ -59,13 +161,13 @@ If you get `Error: Cannot find module 'cdk8s'` when running `tl umbrella synth`:
   "version": "1.0.0",
   "type": "module",
   "dependencies": {
-    "cdk8s": "^2.70.11",
-    "cdk8s-plus-33": "^2.3.5",
+    "cdk8s": "^2.70.15",
+    "cdk8s-plus-33": "^2.3.6",
     "constructs": "^10.4.2",
-    "timonel": "^2.9.0"
+    "timonel": "^2.9.2"
   },
   "devDependencies": {
-    "@types/node": "^24.3.0",
+    "@types/node": "^24.5.2",
     "typescript": "^5.9.2"
   }
 }
@@ -78,6 +180,45 @@ npm install
 tl umbrella synth  # Now it works!
 ```
 
+### Version Display Issues
+
+If the CLI shows an incorrect version:
+
+**Problem**: The CLI might be using cached or hardcoded version information.
+
+**Solution**: Rebuild the project:
+
+```bash
+# In the Timonel project directory
+pnpm build
+tl --version  # Should show correct version
+```
+
+### TypeScript Compilation Errors
+
+If you encounter TypeScript errors when using umbrella charts:
+
+**Problem**: Type mismatches in subchart configurations.
+
+**Solution**: Ensure proper type casting for version and description fields:
+
+```typescript
+// ✅ Correct
+const subchart = {
+  name: 'my-service',
+  version: '1.0.0' as string,
+  description: 'My service' as string,
+  chart: myChartFunction,
+};
+
+// ❌ Incorrect
+const subchart = {
+  name: 'my-service',
+  version: someUnknownValue, // This will cause TypeScript errors
+  chart: myChartFunction,
+};
+```
+
 ## 🤝 Contributing
 
 See our [Contributing Guide](https://github.com/KenkoGeek/timonel/wiki/Contributing) for development
@@ -104,6 +245,6 @@ MIT
 [maintained-badge]: https://img.shields.io/badge/maintained%20by-KenkoGeek-6C78AF?style=flat
 [maintained-url]: https://github.com/kenkogeek/
 [ci-badge]: https://github.com/KenkoGeek/timonel/actions/workflows/test.yaml/badge.svg?branch=main
-[ci-url]: https://github.com/KenkoGeek/timonel/actions/workflows/teast.yaml
+[ci-url]: https://github.com/KenkoGeek/timonel/actions/workflows/test.yaml
 [codeql-badge]: https://github.com/KenkoGeek/timonel/actions/workflows/codeql.yaml/badge.svg
 [codeql-url]: https://github.com/KenkoGeek/timonel/actions/workflows/codeql.yaml

package/SECURITY.md

@@ -14,24 +14,40 @@
 - Steps to reproduce
 - Potential impact assessment
 - Suggested mitigation (if any)
+- Affected versions
 
 **Response timeline:**
 
 - Initial response: 48 hours
 - Triage completion: 5 business days
 - Status updates: Every 10 business days
+- Fix timeline: Depends on severity (Critical: 72h, High: 1 week, Medium: 2 weeks)
+
+**Severity levels:**
+
+- **Critical**: Remote code execution, privilege escalation, data breach
+- **High**: Authentication bypass, significant data exposure
+- **Medium**: Information disclosure, denial of service
+- **Low**: Minor information leakage, cosmetic issues
 
 ## Supported Versions
 
 We provide security updates for the following versions:
 
-| Version | Supported      | Notes                        |
-| ------- | -------------- | ---------------------------- |
-| 2.4.0+  | ✅ Current     | Enhanced security features   |
-| 2.3.x   | ✅ Supported   | Enhanced security features   |
-| 2.0-2.2 | ⚠️ Limited     | Critical security fixes only |
-| 1.x.x   | ❌ End of life | No security updates          |
-| < 1.0   | ❌ End of life | No security updates          |
+| Version | Supported      | Security Updates | End of Life |
+| ------- | -------------- | ---------------- | ----------- |
+| 2.4.0+  | ✅ Current     | Full support     | TBD         |
+| 2.3.x   | ✅ Supported   | Full support     | TBD         |
+| 2.0-2.2 | ⚠️ Limited     | Critical only    | 2024-12-31  |
+| 1.x.x   | ❌ End of life | None             | 2024-06-30  |
+| < 1.0   | ❌ End of life | None             | 2024-01-01  |
+
+**Update policy:**
+
+- **Current versions**: All security updates within 48 hours
+- **Supported versions**: Critical updates within 1 week
+- **Limited versions**: Critical updates only, within 2 weeks
+- **End of life**: No updates provided
 
 ## Development Security
 
@@ -57,6 +73,10 @@ We provide security updates for the following versions:
 - **Multi-layer scanning**: ESLint security plugin + CodeQL + pnpm audit
 - **Branch protection**: Required status checks and reviews
 - **Secrets management**: No hardcoded credentials
+- **Native dependencies**: Uses `workflow_run` for secure pipeline dependencies
+- **Environment protection**: Production releases require manual approval
+- **Automated security**: Security scans run on every PR and push
+- **Dependency provenance**: NPM_CONFIG_PROVENANCE enabled for package integrity
 
 ### Security Features
 
@@ -77,3 +97,29 @@ We provide security updates for the following versions:
 - **Values files**: Avoid hardcoded secrets in values
 - **Network policies**: Use provided NetworkPolicy helpers
 - **RBAC**: Apply principle of least privilege in Kubernetes
+
+## Security Best Practices
+
+### For Developers
+
+- **Keep dependencies updated**: Run `pnpm audit` regularly
+- **Review PRs carefully**: Check for security implications
+- **Use security tools**: Enable IDE security plugins
+- **Follow secure coding**: Avoid dangerous patterns (eval, innerHTML, etc.)
+- **Test security features**: Verify input validation and sanitization
+
+### For Users
+
+- **Update regularly**: Always use the latest stable version
+- **Review configurations**: Check generated Helm charts before deployment
+- **Use secrets management**: Never hardcode credentials
+- **Monitor deployments**: Watch for unusual behavior
+- **Apply patches**: Install security updates promptly
+
+## Security Tools Integration
+
+- **GitHub Dependabot**: Automated dependency updates
+- **CodeQL**: Static analysis for security vulnerabilities
+- **ESLint Security**: Runtime security checks
+- **pnpm audit**: Dependency vulnerability scanning
+- **Semantic Release**: Automated versioning with security considerations

package/dist/cli.js

@@ -8,6 +8,16 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const UMBRELLA_CONFIG_FILE = 'umbrella.config.json';
 const UMBRELLA_FILE_NAME = 'umbrella.ts';
+function getVersion() {
+    try {
+        const packagePath = path.join(__dirname, '..', 'package.json');
+        const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+        return packageJson.version || '0.1.0';
+    }
+    catch {
+        return '0.1.0';
+    }
+}
 function log(msg, silent = false) {
     if (!silent) {
         console.log(msg);
@@ -214,7 +224,7 @@ async function cmdUmbrellaInit(name, silent = false) {
     fs.writeFileSync(umbrellaFile, generateUmbrellaChart(validName));
     const config = {
         name: validName,
-        version: '0.1.0',
+        version: getVersion(),
         description: `${validName} umbrella chart`,
         subcharts: [],
     };
@@ -315,7 +325,7 @@ async function cmdUmbrellaAdd(subchartPath, silent = false) {
     fs.writeFileSync(chartFile, subchartContent);
     config.subcharts.push({
         name: subchartName,
-        version: '0.1.0',
+        version: getVersion(),
         path: `./charts/${validSubchartPath}/chart.ts`,
     });
     fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
@@ -397,7 +407,7 @@ function parseFlags(args) {
             case '--version':
             case '-v':
                 if (!flags.silent) {
-                    console.log('Timonel v0.1.0');
+                    console.log(`Timonel v${getVersion()}`);
                 }
                 process.exit(0);
                 break;
@@ -448,7 +458,7 @@ async function main() {
     }
     if (args.includes('--version') || args.includes('-v')) {
         if (!isSilent) {
-            console.log('Timonel v0.1.0');
+            console.log(`Timonel v${getVersion()}`);
         }
         process.exit(0);
     }

package/dist/index.d.ts

@@ -3,9 +3,11 @@ export * from './lib/helmChartWriter.js';
 export * from './lib/rutter.js';
 export * from './lib/security.js';
 export * from './lib/umbrella.js';
-export { UmbrellaChartTemplate as UmbrellaChart } from './lib/templates/umbrella-chart.js';
-export { Subchart } from './lib/templates/subchart.js';
 export { BasicChart } from './lib/templates/basic-chart.js';
+export { FlexibleSubchart, createFlexibleSubchart } from './lib/templates/flexible-subchart.js';
+export { Subchart } from './lib/templates/subchart.js';
+export { UmbrellaChartTemplate as UmbrellaChart } from './lib/templates/umbrella-chart.js';
+export type { ChartProps, SubchartProps } from './lib/types.js';
 export type { AWSALBIngressSpec, AWSEBSStorageClassSpec, AWSEFSStorageClassSpec, AWSIRSAServiceAccountSpec, } from './lib/resources/cloud/aws/awsResources.js';
 export type { KarpenterDisruption, KarpenterDisruptionBudget, KarpenterEC2NodeClassSpec, KarpenterNodeClaimSpec, KarpenterNodePoolSpec, } from './lib/resources/cloud/aws/karpenterResources.js';
 export { DEFAULT_TERMINATION_GRACE_PERIOD, isValidDisruptionBudget, isValidKubernetesDuration, KarpenterVersionUtils, } from './lib/resources/cloud/aws/karpenterResources.js';

package/dist/index.js

@@ -3,8 +3,9 @@ export * from './lib/helmChartWriter.js';
 export * from './lib/rutter.js';
 export * from './lib/security.js';
 export * from './lib/umbrella.js';
-export { UmbrellaChartTemplate as UmbrellaChart } from './lib/templates/umbrella-chart.js';
-export { Subchart } from './lib/templates/subchart.js';
 export { BasicChart } from './lib/templates/basic-chart.js';
+export { FlexibleSubchart, createFlexibleSubchart } from './lib/templates/flexible-subchart.js';
+export { Subchart } from './lib/templates/subchart.js';
+export { UmbrellaChartTemplate as UmbrellaChart } from './lib/templates/umbrella-chart.js';
 export { DEFAULT_TERMINATION_GRACE_PERIOD, isValidDisruptionBudget, isValidKubernetesDuration, KarpenterVersionUtils, } from './lib/resources/cloud/aws/karpenterResources.js';
 export { AWS_HELPERS, createHelper, FILE_ACCESS_HELPERS, formatHelpers, generateHelpersTemplate, getDefaultHelpers, getHelpersByCategory, KUBERNETES_HELPERS, SPRIG_HELPERS, STANDARD_HELPERS, TEMPLATE_FUNCTION_HELPERS, } from './lib/utils/helmHelpers.js';

package/dist/lib/helmChartWriter.js

@@ -5,7 +5,7 @@ import { dumpHelmAwareYaml } from './utils/helmYamlSerializer.js';
 export class HelmChartWriter {
     static write(opts) {
         const { outDir, meta, defaultValues = {}, envValues = {}, assets, helpersTpl, notesTpl, valuesSchema, } = opts;
-        console.log(`📝 Writing Helm chart: ${meta.name} v${meta.version} to ${outDir}`);
+        console.log(`Writing chart: ${meta.name} v${meta.version} to ${outDir}`);
         const validatedOutDir = SecurityUtils.validatePath(outDir, process.cwd());
         this.createDirectories(validatedOutDir);
         this.writeChartYaml(validatedOutDir, meta);
@@ -15,7 +15,7 @@ export class HelmChartWriter {
         this.writeNotes(validatedOutDir, notesTpl);
         this.writeSchema(validatedOutDir, valuesSchema);
         this.writeHelmIgnore(validatedOutDir);
-        console.log(`✅ Helm chart written successfully to ${validatedOutDir}`);
+        console.log(`Chart written successfully to ${validatedOutDir}`);
     }
     static createDirectories(outDir) {
         fs.mkdirSync(path.join(outDir, 'templates'), { recursive: true });
@@ -111,7 +111,7 @@ function writeAssets(outDir, assets) {
     for (const asset of assets) {
         const sanitizedId = asset.id.replace(/[^a-zA-Z0-9-_]/g, '');
         if (sanitizedId !== asset.id) {
-            console.error(`❌ Invalid asset ID detected: ${SecurityUtils.sanitizeLogMessage(asset.id)}`);
+            console.error(`Invalid asset ID detected: ${SecurityUtils.sanitizeLogMessage(asset.id)}`);
             throw new Error(`Invalid asset ID: ${SecurityUtils.sanitizeLogMessage(asset.id)}`);
         }
         const targetDir = getTargetDirectory(asset.target);
@@ -124,7 +124,7 @@ function writeAssets(outDir, assets) {
             }
         }
         catch (error) {
-            console.error(`❌ Failed to write asset ${asset.id}:`, error);
+            console.error(`Failed to write asset ${asset.id}:`, error);
             throw error;
         }
     }
@@ -134,7 +134,7 @@ function getTargetDirectory(target) {
 }
 function writeSingleAssetFile(outDir, targetDir, assetId, yaml) {
     if (assetId === 'ingress' && yaml.includes('number:')) {
-        console.log('🔍 Writing ingress file with content:');
+        console.log('Writing ingress file with number fields');
         const numberLines = yaml.split('\n').filter((line) => line.includes('number:'));
         console.log('Number lines:', numberLines);
     }

package/dist/lib/rutter.js

@@ -2,14 +2,14 @@ import { ApiObject, App, Chart, Testing } from 'cdk8s';
 import * as jsYaml from 'js-yaml';
 import { include } from './helm.js';
 import { HelmChartWriter } from './helmChartWriter.js';
-import { dumpHelmAwareYaml } from './utils/helmYamlSerializer.js';
 import { AWSResources } from './resources/cloud/aws/awsResources.js';
 import { KarpenterResources } from './resources/cloud/aws/karpenterResources.js';
+import { dumpHelmAwareYaml } from './utils/helmYamlSerializer.js';
 import { generateHelpersTemplate } from './utils/helmHelpers.js';
 export class Rutter {
     constructor(props) {
         this.assets = [];
-        console.log(`🚀 Initializing Rutter chart: ${props.meta.name} v${props.meta.version}`);
+        console.log(`Initializing chart: ${props.meta.name} v${props.meta.version}`);
         this.defaultValues = props.defaultValues ?? {};
         this.envValues = props.envValues ?? {};
         this.meta = props.meta;
@@ -134,24 +134,24 @@ ${yamlContent.trim()}
     }
     validateManifestStructure(manifest) {
         if (!manifest.apiVersion) {
-            console.error('❌ Manifest validation failed: Missing apiVersion');
+            console.error('Validation failed: Missing apiVersion');
             throw new Error('Manifest must have an apiVersion');
         }
         if (!manifest.kind) {
-            console.error('❌ Manifest validation failed: Missing kind');
+            console.error('Validation failed: Missing kind');
             throw new Error('Manifest must have a kind');
         }
         if (!manifest.metadata) {
-            console.error('❌ Manifest validation failed: Missing metadata');
+            console.error('Validation failed: Missing metadata');
             throw new Error('Manifest must have metadata');
         }
         const metadata = manifest.metadata;
         if (!metadata.name) {
-            console.error('❌ Manifest validation failed: Missing metadata.name');
+            console.error('Validation failed: Missing metadata.name');
             throw new Error('Manifest metadata must have a name');
         }
         if (typeof metadata.name !== 'string') {
-            console.error('❌ Manifest validation failed: metadata.name must be a string');
+            console.error('Validation failed: metadata.name must be a string');
             throw new Error('Manifest metadata.name must be a string');
         }
     }
@@ -193,7 +193,7 @@ ${yamlContent.trim()}
                 const labels = o.metadata.labels;
                 const defaults = {
                     'helm.sh/chart': `{{ .Chart.Name }}-{{ .Chart.Version }}`,
-                    'app.kubernetes.io/name': `{{ ${include} "${Rutter.HELPER_NAME}" . }}`,
+                    'app.kubernetes.io/name': include(Rutter.HELPER_NAME),
                     'app.kubernetes.io/instance': '{{ .Release.Name }}',
                     'app.kubernetes.io/version': '{{ .Chart.Version }}',
                     'app.kubernetes.io/managed-by': '{{ .Release.Service }}',
@@ -399,7 +399,7 @@ ${yamlContent.trim()}
         return processed;
     }
     write(outDir) {
-        console.log(`✍️  Writing Helm chart '${this.meta.name}' to: ${outDir}`);
+        console.log(`Writing chart '${this.meta.name}' to: ${outDir}`);
         let helpersContent;
         if (this.props.helpersTpl) {
             if (typeof this.props.helpersTpl === 'string') {
@@ -429,7 +429,7 @@ ${helper.template}
             assets: synthAssets,
             helpersTpl: helpersContent,
         });
-        console.log(`✅ Helm chart '${this.meta.name}' written successfully`);
+        console.log(`Chart '${this.meta.name}' written successfully`);
     }
 }
 Rutter.HELPER_NAME = 'chart.name';

package/dist/lib/templates/flexible-subchart.d.ts

@@ -0,0 +1,27 @@
+import { Chart } from 'cdk8s';
+export declare class FlexibleSubchart extends Chart {
+    private readonly config;
+    private _constructs;
+    private _manifests;
+    constructor(scope: Chart, id: string, config: {
+        name: string;
+        version?: string;
+        description?: string;
+        construct?: unknown;
+        manifest?: unknown;
+        [key: string]: unknown;
+    });
+    addConstruct(construct: unknown, id?: string): void;
+    addManifest(manifest: unknown, id?: string): void;
+    private configure;
+    writeHelmChart(outputDir: string): void;
+    private _generateManifestTemplate;
+    getConstructs(): unknown[];
+    getManifests(): unknown[];
+}
+export declare function createFlexibleSubchart(scope: Chart, id: string, config: {
+    name: string;
+    version?: string;
+    description?: string;
+    [key: string]: unknown;
+}): FlexibleSubchart;

package/dist/lib/templates/flexible-subchart.js

@@ -0,0 +1,107 @@
+import { writeFileSync, mkdirSync, existsSync } from 'fs';
+import { join } from 'path';
+import { Chart } from 'cdk8s';
+import { dumpHelmAwareYaml } from '../utils/helmYamlSerializer.js';
+import { generateHelpersTemplate } from '../utils/helmHelpers.js';
+export class FlexibleSubchart extends Chart {
+    constructor(scope, id, config) {
+        super(scope, id);
+        this.config = config;
+        this._constructs = [];
+        this._manifests = [];
+        this.configure();
+    }
+    addConstruct(construct, id) {
+        if (construct) {
+            this._constructs.push({ construct, id: id || `construct-${this._constructs.length}` });
+        }
+    }
+    addManifest(manifest, id) {
+        if (manifest) {
+            this._manifests.push({ manifest, id: id || `manifest-${this._manifests.length}` });
+        }
+    }
+    configure() {
+        if (this.config.construct) {
+            this.addConstruct(this.config.construct);
+        }
+        if (this.config.manifest) {
+            this.addManifest(this.config.manifest);
+        }
+        Object.entries(this.config).forEach(([key, value]) => {
+            if (key !== 'name' &&
+                key !== 'version' &&
+                key !== 'description' &&
+                key !== 'construct' &&
+                key !== 'manifest' &&
+                value) {
+                this.addConstruct(value, key);
+            }
+        });
+    }
+    writeHelmChart(outputDir) {
+        if (!existsSync(outputDir)) {
+            mkdirSync(outputDir, { recursive: true });
+        }
+        const subchartYaml = {
+            apiVersion: 'v2',
+            name: this.config.name,
+            description: this.config.description || `${this.config.name} subchart`,
+            type: 'application',
+            version: this.config.version || '1.0.0',
+            appVersion: this.config.version || '1.0.0',
+        };
+        writeFileSync(join(outputDir, 'Chart.yaml'), dumpHelmAwareYaml(subchartYaml));
+        const subchartValues = {
+            enabled: true,
+            ...Object.fromEntries(Object.entries(this.config).filter(([key, value]) => key !== 'chart' && typeof value !== 'function' && value !== null && value !== undefined)),
+        };
+        writeFileSync(join(outputDir, 'values.yaml'), dumpHelmAwareYaml(subchartValues));
+        const templatesDir = join(outputDir, 'templates');
+        if (!existsSync(templatesDir)) {
+            mkdirSync(templatesDir, { recursive: true });
+        }
+        const helpersTpl = generateHelpersTemplate('aws', undefined, {
+            includeKubernetes: true,
+            includeSprig: true,
+        });
+        writeFileSync(join(templatesDir, '_helpers.tpl'), helpersTpl);
+        this._manifests.forEach((item) => {
+            if (item && typeof item === 'object' && 'manifest' in item && 'id' in item) {
+                const { manifest, id } = item;
+                if (manifest && typeof manifest === 'object') {
+                    const templateContent = this._generateManifestTemplate(manifest, id);
+                    writeFileSync(join(templatesDir, `${id}.yaml`), templateContent);
+                }
+            }
+        });
+        console.log(`Created flexible Helm chart for subchart: ${this.config.name}`);
+    }
+    _generateManifestTemplate(manifest, id) {
+        if (typeof manifest !== 'object' || manifest === null) {
+            return dumpHelmAwareYaml({});
+        }
+        const manifestObj = manifest;
+        const template = {
+            apiVersion: manifestObj.apiVersion || 'v1',
+            kind: manifestObj.kind || 'Manifest',
+            metadata: {
+                name: `{{ include "${id}.fullname" . }}`,
+                labels: `{{ include "${id}.labels" . }}`,
+                ...(manifestObj.metadata || {}),
+            },
+            spec: manifestObj.spec || {},
+            ...manifestObj,
+        };
+        return dumpHelmAwareYaml(template);
+    }
+    getConstructs() {
+        return this._constructs;
+    }
+    getManifests() {
+        return this._manifests;
+    }
+}
+export function createFlexibleSubchart(scope, id, config) {
+    return new FlexibleSubchart(scope, id, config);
+}

package/dist/lib/templates/umbrella-chart.d.ts

@@ -9,5 +9,6 @@ export declare class UmbrellaChartTemplate extends Chart {
     private configure;
     private _addService;
     private _addSubchart;
+    private _createBasicSubchart;
     writeHelmChart(outputDir: string): void;
 }

package/dist/lib/templates/umbrella-chart.js

@@ -3,6 +3,7 @@ import { join } from 'path';
 import { Chart, ApiObject } from 'cdk8s';
 import { dumpHelmAwareYaml } from '../utils/helmYamlSerializer.js';
 import { generateHelpersTemplate } from '../utils/helmHelpers.js';
+import { createFlexibleSubchart } from './flexible-subchart.js';
 export function generateUmbrellaChart(name) {
     return `import { App } from 'cdk8s';
 import { UmbrellaChart } from 'timonel';
@@ -92,7 +93,87 @@ export class UmbrellaChartTemplate extends Chart {
             },
         });
     }
-    _addSubchart(_subchart, _index) {
+    _addSubchart(subchart, index) {
+        try {
+            let _subchartInstance;
+            const { name: _name, version: _version, description: _description, ...subchartProps } = subchart;
+            const flexibleSubchart = createFlexibleSubchart(this, `${subchart.name}-${index}`, {
+                name: subchart.name,
+                version: subchart.version || '1.0.0',
+                description: subchart.description || `${subchart.name} subchart`,
+                ...subchartProps,
+            });
+            if (typeof subchart.chart === 'function') {
+                try {
+                    const subchartInstance = subchart.chart(this, `${subchart.name}-${index}`);
+                    if (subchartInstance.node.children) {
+                        subchartInstance.node.children.forEach((child) => {
+                            if (child instanceof Chart) {
+                                flexibleSubchart.addConstruct(child);
+                            }
+                        });
+                    }
+                }
+                catch {
+                    const subchartInstance = subchart.chart();
+                    if (subchartInstance.node.children) {
+                        subchartInstance.node.children.forEach((child) => {
+                            if (child instanceof Chart) {
+                                flexibleSubchart.addConstruct(child);
+                            }
+                        });
+                    }
+                }
+            }
+            else if (subchart.chart && typeof subchart.chart === 'object') {
+                if (subchart.chart.constructor && subchart.chart.constructor.name !== 'Object') {
+                    flexibleSubchart.addConstruct(subchart.chart);
+                }
+                else {
+                    flexibleSubchart.addManifest(subchart.chart);
+                }
+            }
+            console.log(`Added flexible subchart: ${subchart.name}`);
+        }
+        catch (_error) {
+            console.warn(`Failed to add subchart ${subchart.name}:`, _error);
+            const _fallbackSubchart = createFlexibleSubchart(this, `${subchart.name}-fallback-${index}`, {
+                name: subchart.name,
+                version: subchart.version || '1.0.0',
+                description: `${subchart.name} subchart (fallback)`,
+            });
+            console.log(`Created fallback subchart: ${subchart.name}`);
+        }
+    }
+    _createBasicSubchart(subchartName, subchartDir) {
+        const subchartYaml = {
+            apiVersion: 'v2',
+            name: subchartName,
+            description: `${subchartName} subchart`,
+            type: 'application',
+            version: '1.0.0',
+            appVersion: '1.0.0',
+        };
+        writeFileSync(join(subchartDir, 'Chart.yaml'), dumpHelmAwareYaml(subchartYaml));
+        const subchartValues = {
+            enabled: true,
+            replicas: 1,
+            image: {
+                repository: 'nginx',
+                tag: 'latest',
+            },
+        };
+        writeFileSync(join(subchartDir, 'values.yaml'), dumpHelmAwareYaml(subchartValues));
+        const templatesDir = join(subchartDir, 'templates');
+        if (!existsSync(templatesDir)) {
+            mkdirSync(templatesDir, { recursive: true });
+        }
+        const helpersTpl = generateHelpersTemplate('aws', undefined, {
+            includeKubernetes: true,
+            includeSprig: true,
+        });
+        writeFileSync(join(templatesDir, '_helpers.tpl'), helpersTpl);
+        console.log(`Created basic Helm chart structure for subchart: ${subchartName}`);
     }
     writeHelmChart(outputDir) {
         if (!existsSync(outputDir)) {
@@ -133,21 +214,50 @@ export class UmbrellaChartTemplate extends Chart {
             if (!existsSync(subchartDir)) {
                 mkdirSync(subchartDir, { recursive: true });
             }
-            let subchartInstance = null;
+            const { name: _name, version: _version, description: _description, ...subchartProps } = subchart;
+            const flexibleSubchart = createFlexibleSubchart(this, `${subchart.name}-chart`, {
+                name: subchart.name,
+                version: subchart.version || '1.0.0',
+                description: subchart.description || `${subchart.name} subchart`,
+                ...subchartProps,
+            });
             if (typeof subchart.chart === 'function') {
                 try {
-                    subchartInstance = subchart.chart();
+                    const chartInstance = subchart.chart(this, `${subchart.name}-chart`);
+                    if (chartInstance && typeof chartInstance.writeHelmChart === 'function') {
+                        chartInstance.writeHelmChart(subchartDir);
+                    }
+                    else {
+                        flexibleSubchart.writeHelmChart(subchartDir);
+                    }
                 }
-                catch (error) {
-                    console.warn(`Failed to create subchart ${subchart.name}:`, error);
-                    return;
+                catch {
+                    try {
+                        const chartInstance = subchart.chart();
+                        if (chartInstance && typeof chartInstance.writeHelmChart === 'function') {
+                            chartInstance.writeHelmChart(subchartDir);
+                        }
+                        else {
+                            flexibleSubchart.writeHelmChart(subchartDir);
+                        }
+                    }
+                    catch (fallbackError) {
+                        console.warn(`Failed to create subchart ${subchart.name}:`, fallbackError);
+                        flexibleSubchart.writeHelmChart(subchartDir);
+                    }
                 }
             }
-            else {
-                subchartInstance = subchart.chart;
+            else if (subchart.chart && typeof subchart.chart === 'object') {
+                if (subchart.chart.constructor && subchart.chart.constructor.name !== 'Object') {
+                    flexibleSubchart.addConstruct(subchart.chart);
+                }
+                else {
+                    flexibleSubchart.addManifest(subchart.chart);
+                }
+                flexibleSubchart.writeHelmChart(subchartDir);
             }
-            if (subchartInstance && typeof subchartInstance.writeHelmChart === 'function') {
-                subchartInstance.writeHelmChart(subchartDir);
+            else {
+                flexibleSubchart.writeHelmChart(subchartDir);
             }
         });
         const templatesDir = join(outputDir, 'templates');

package/dist/lib/types.d.ts

@@ -3,6 +3,9 @@ export interface ChartProps {
     name: string;
     version: string;
     description: string;
+    namespace?: string;
+    labels?: Record<string, string>;
+    annotations?: Record<string, string>;
     services?: Array<{
         name: string;
         port: number;
@@ -10,8 +13,12 @@ export interface ChartProps {
     }>;
     subcharts?: Array<{
         name: string;
-        chart: Chart | (() => Chart);
+        chart: Chart | ((scope: Chart, id: string) => Chart) | unknown;
+        version?: string;
+        enabled?: boolean;
+        [key: string]: unknown;
     }>;
+    [key: string]: unknown;
 }
 export interface SubchartProps {
     name: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "timonel",
   "type": "module",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "description": "Timonel: programmatic Helm chart generator using cdk8s (TypeScript)",
   "bin": {
     "timonel": "dist/cli.js",
@@ -81,29 +81,29 @@
     ]
   },
   "dependencies": {
-    "cdk8s": "^2.70.11",
-    "cdk8s-plus-33": "^2.3.5",
+    "cdk8s": "^2.70.15",
+    "cdk8s-plus-33": "^2.3.6",
     "constructs": "^10.4.2",
     "handlebars": "^4.7.8",
     "js-yaml": "^4.1.0",
-    "timonel": "^2.9.0",
+    "timonel": "^2.9.2",
     "ts-node": "^10.9.2",
     "yaml": "^2.8.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.35.0",
+    "@eslint/js": "^9.36.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^24.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.42.0",
-    "@typescript-eslint/parser": "^8.42.0",
-    "@vitest/coverage-v8": "^2.1.9",
+    "@types/node": "^24.5.2",
+    "@typescript-eslint/eslint-plugin": "^8.44.0",
+    "@typescript-eslint/parser": "^8.44.0",
+    "@vitest/coverage-v8": "^3.2.4",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.35.0",
+    "eslint": "^9.36.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
@@ -115,10 +115,10 @@
     "markdownlint": "^0.38.0",
     "markdownlint-cli": "^0.45.0",
     "prettier": "^3.6.2",
-    "semantic-release": "^24.2.7",
+    "semantic-release": "^24.2.9",
     "tsx": "^4.20.5",
     "typescript": "^5.9.2",
-    "vitest": "^2.1.9"
+    "vitest": "^3.2.4"
   },
   "files": [
     "dist",