timonel 2.9.1 → 2.10.0

package/dist/lib/rutter.js

@@ -1,15 +1,15 @@
 import { ApiObject, App, Chart, Testing } from 'cdk8s';
-import Handlebars from 'handlebars';
-import YAML from 'yaml';
+import * as jsYaml from 'js-yaml';
 import { include } from './helm.js';
 import { HelmChartWriter } from './helmChartWriter.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;
@@ -56,7 +56,7 @@ export class Rutter {
         let manifestObject;
         if (typeof yamlOrObject === 'string') {
             try {
-                manifestObject = YAML.parse(yamlOrObject);
+                manifestObject = jsYaml.load(yamlOrObject);
             }
             catch (error) {
                 throw new Error(`Invalid YAML provided to addManifest(): ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -102,20 +102,12 @@ export class Rutter {
             helmCondition = `.Values.${condition}`;
         }
         try {
-            const yamlContent = YAML.stringify(manifestObject, {
+            const yamlContent = dumpHelmAwareYaml(manifestObject, {
                 lineWidth: 0,
-                doubleQuotedAsJSON: false,
-                simpleKeys: true,
-            });
-            const conditionalTemplate = `\\{{- if ${helmCondition} }}
-{{{manifestYaml}}}
-\\{{- end }}`;
-            const template = Handlebars.compile(conditionalTemplate, {
-                noEscape: true,
-            });
-            const conditionalYaml = template({
-                manifestYaml: yamlContent.trim(),
             });
+            const conditionalYaml = `{{- if ${helmCondition} }}
+${yamlContent.trim()}
+{{- end }}`;
             const conditionalAsset = {
                 id,
                 yaml: conditionalYaml,
@@ -124,7 +116,7 @@ export class Rutter {
             this.assets.push(conditionalAsset);
         }
         catch (error) {
-            throw new Error(`Failed to compile Handlebars template for manifest '${id}': ${error instanceof Error ? error.message : 'Unknown error'}`);
+            throw new Error(`Failed to generate conditional template for manifest '${id}': ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
         return new ApiObject(this.chart, `${id}-placeholder`, {
             apiVersion: manifestObject['apiVersion'],
@@ -142,24 +134,24 @@ export class Rutter {
     }
     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');
         }
     }
@@ -201,7 +193,7 @@ export class Rutter {
                 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 }}',
@@ -218,7 +210,7 @@ export class Rutter {
         const synthAssets = [];
         if (this.props.singleManifestFile) {
             const combinedYaml = enriched
-                .map((obj) => this.processHelmTemplates(YAML.stringify(obj).trim()))
+                .map((obj) => this.processHelmTemplates(dumpHelmAwareYaml(obj).trim()))
                 .filter(Boolean)
                 .join('\n---\n');
             const manifestId = this.props.manifestPrefix ?? 'manifests';
@@ -228,7 +220,7 @@ export class Rutter {
             enriched.forEach((obj, index) => {
                 const apiObjectId = apiObjectIds[index];
                 const manifestId = apiObjectId || `manifest-${index + 1}`;
-                const yaml = this.processHelmTemplates(YAML.stringify(obj).trim());
+                const yaml = this.processHelmTemplates(dumpHelmAwareYaml(obj).trim());
                 if (yaml) {
                     synthAssets.push({ id: manifestId, yaml });
                 }
@@ -407,7 +399,7 @@ export class Rutter {
         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') {
@@ -437,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/basic-chart.js

@@ -1,5 +1,6 @@
 import { Chart, ApiObject } from 'cdk8s';
 import { Rutter } from '../rutter.js';
+import { generateHelpersTemplate } from '../utils/helmHelpers.js';
 export class BasicChart extends Chart {
     constructor(scope, id, props = {}) {
         super(scope, id, props);
@@ -24,6 +25,10 @@ export class BasicChart extends Chart {
                 replicas,
                 createNamespace,
             },
+            helpersTpl: generateHelpersTemplate('aws', undefined, {
+                includeKubernetes: true,
+                includeSprig: true,
+            }),
         });
         if (createNamespace) {
             this.rutter.addConditionalManifest({
@@ -41,6 +46,11 @@ export class BasicChart extends Chart {
                 name: `{{ .Values.appName }}`,
                 labels: {
                     app: `{{ .Values.appName }}`,
+                    'helm.sh/chart': `{{ .Chart.Name }}-{{ .Chart.Version }}`,
+                    'app.kubernetes.io/name': `{{ .Chart.Name }}`,
+                    'app.kubernetes.io/instance': `{{ .Release.Name }}`,
+                    'app.kubernetes.io/version': `{{ .Chart.AppVersion }}`,
+                    'app.kubernetes.io/managed-by': `{{ .Release.Service }}`,
                 },
             },
             spec: {
@@ -48,12 +58,16 @@ export class BasicChart extends Chart {
                 selector: {
                     matchLabels: {
                         app: `{{ .Values.appName }}`,
+                        'app.kubernetes.io/name': `{{ .Chart.Name }}`,
+                        'app.kubernetes.io/instance': `{{ .Release.Name }}`,
                     },
                 },
                 template: {
                     metadata: {
                         labels: {
                             app: `{{ .Values.appName }}`,
+                            'app.kubernetes.io/name': `{{ .Chart.Name }}`,
+                            'app.kubernetes.io/instance': `{{ .Release.Name }}`,
                         },
                     },
                     spec: {
@@ -79,6 +93,11 @@ export class BasicChart extends Chart {
                 name: `{{ .Values.appName }}`,
                 labels: {
                     app: `{{ .Values.appName }}`,
+                    'helm.sh/chart': `{{ .Chart.Name }}-{{ .Chart.Version }}`,
+                    'app.kubernetes.io/name': `{{ .Chart.Name }}`,
+                    'app.kubernetes.io/instance': `{{ .Release.Name }}`,
+                    'app.kubernetes.io/version': `{{ .Chart.AppVersion }}`,
+                    'app.kubernetes.io/managed-by': `{{ .Release.Service }}`,
                 },
             },
             spec: {
@@ -90,6 +109,8 @@ export class BasicChart extends Chart {
                 ],
                 selector: {
                     app: `{{ .Values.appName }}`,
+                    'app.kubernetes.io/name': `{{ .Chart.Name }}`,
+                    'app.kubernetes.io/instance': `{{ .Release.Name }}`,
                 },
             },
         }, 'service');

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/subchart.js

@@ -1,5 +1,6 @@
 import { App, Chart } from 'cdk8s';
 import { Rutter } from '../rutter.js';
+import { generateHelpersTemplate } from '../utils/helmHelpers.js';
 export class Subchart extends Chart {
     constructor(scope, id, props = {}) {
         super(scope, id, props);
@@ -39,6 +40,10 @@ export class Subchart extends Chart {
                     tls: [],
                 },
             },
+            helpersTpl: generateHelpersTemplate('aws', undefined, {
+                includeKubernetes: true,
+                includeSprig: true,
+            }),
         });
         this.rutter.addManifest({
             apiVersion: 'v1',
@@ -131,54 +136,47 @@ export class Subchart extends Chart {
                 },
             },
         }, 'service');
-        this.rutter.addTemplateManifest(`{{- if .Values.enableIngress }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "chart.fullname" . }}
-  labels:
-    {{- include "chart.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if and .Values.ingress.className (not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class")) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ include "chart.fullname" $ }}
-                port:
-                  number: {{ $.Values.port | int }}
-              {{- else }}
-              serviceName: {{ include "chart.fullname" $ }}
-              servicePort: {{ $.Values.port | int }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}`, 'ingress');
+        this.rutter.addConditionalManifest({
+            apiVersion: 'networking.k8s.io/v1',
+            kind: 'Ingress',
+            metadata: {
+                name: `{{ .Release.Name }}-{{ .Values.appName }}`,
+                labels: {
+                    app: `{{ .Values.appName }}`,
+                    'helm.sh/chart': `{{ .Chart.Name }}-{{ .Chart.Version }}`,
+                    'app.kubernetes.io/name': `{{ .Chart.Name }}`,
+                    'app.kubernetes.io/instance': `{{ .Release.Name }}`,
+                    'app.kubernetes.io/version': `{{ .Chart.AppVersion }}`,
+                    'app.kubernetes.io/managed-by': `{{ .Release.Service }}`,
+                },
+                annotations: `{{ toYaml .Values.ingress.annotations | nindent 4 }}`,
+            },
+            spec: {
+                ingressClassName: `{{ .Values.ingress.className }}`,
+                tls: `{{ toYaml .Values.ingress.tls | nindent 4 }}`,
+                rules: [
+                    {
+                        host: `{{ .Values.ingressHost }}`,
+                        http: {
+                            paths: [
+                                {
+                                    path: '/',
+                                    pathType: 'Prefix',
+                                    backend: {
+                                        service: {
+                                            name: `{{ .Release.Name }}-{{ .Values.appName }}`,
+                                            port: {
+                                                number: `{{ .Values.port }}`,
+                                            },
+                                        },
+                                    },
+                                },
+                            ],
+                        },
+                    },
+                ],
+            },
+        }, 'enableIngress', 'ingress');
     }
     get rutterInstance() {
         return this.rutter;

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;
 }