@intentius/chant-lexicon-helm 0.0.18 → 0.0.24

package/src/composites/helm-batch-job.ts

@@ -5,6 +5,8 @@
  * Kubernetes API access (e.g., data migrations, cluster operations).
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, Job, ServiceAccount, Role, RoleBinding } from "../resources";
 import { values, include, printf, toYaml, If, With } from "../intrinsics";
 
 export interface HelmBatchJobProps {
@@ -38,18 +40,27 @@ export interface HelmBatchJobProps {
   tolerations?: Array<Record<string, unknown>>;
   /** Chart appVersion. */
   appVersion?: string;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    job?: Partial<Record<string, unknown>>;
+    serviceAccount?: Partial<Record<string, unknown>>;
+    role?: Partial<Record<string, unknown>>;
+    roleBinding?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmBatchJobResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  job: Record<string, unknown>;
-  serviceAccount?: Record<string, unknown>;
-  role?: Record<string, unknown>;
-  roleBinding?: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  job: InstanceType<typeof Job>;
+  serviceAccount?: InstanceType<typeof ServiceAccount>;
+  role?: InstanceType<typeof Role>;
+  roleBinding?: InstanceType<typeof RoleBinding>;
 }
 
-export function HelmBatchJob(props: HelmBatchJobProps): HelmBatchJobResult {
+export const HelmBatchJob = Composite<HelmBatchJobProps>((props) => {
   const {
     name,
     imageRepository = "busybox",
@@ -61,16 +72,17 @@ export function HelmBatchJob(props: HelmBatchJobProps): HelmBatchJobResult {
     serviceAccount = true,
     rbac = false,
     appVersion = "1.0.0",
+    defaults: defs,
   } = props;
 
-  const chart = {
+  const chart = new Chart(mergeDefaults({
     apiVersion: "v2",
     name,
     version: "0.1.0",
     appVersion,
     type: "application",
     description: `A Helm chart for ${name} batch job`,
-  };
+  }, defs?.chart));
 
   const valuesObj: Record<string, unknown> = {
     image: {
@@ -113,6 +125,8 @@ export function HelmBatchJob(props: HelmBatchJobProps): HelmBatchJobResult {
     };
   }
 
+  const valuesRes = new Values(mergeDefaults(valuesObj, defs?.values));
+
   const containerSpec: Record<string, unknown> = {
     name,
     image: printf("%s:%s", values.image.repository, values.image.tag),
@@ -150,7 +164,7 @@ export function HelmBatchJob(props: HelmBatchJobProps): HelmBatchJobResult {
     jobSpec.ttlSecondsAfterFinished = values.job.ttlSecondsAfterFinished;
   }
 
-  const job = {
+  const job = new Job(mergeDefaults({
     apiVersion: "batch/v1",
     kind: "Job",
     metadata: {
@@ -158,12 +172,12 @@ export function HelmBatchJob(props: HelmBatchJobProps): HelmBatchJobResult {
       labels: include(`${name}.labels`),
     },
     spec: jobSpec,
-  };
+  }, defs?.job));
 
-  const result: HelmBatchJobResult = { chart, values: valuesObj, job };
+  const result: Record<string, any> = { chart, values: valuesRes, job };
 
   if (serviceAccount) {
-    result.serviceAccount = {
+    result.serviceAccount = new ServiceAccount(mergeDefaults({
       apiVersion: "v1",
       kind: "ServiceAccount",
       metadata: {
@@ -171,11 +185,11 @@ export function HelmBatchJob(props: HelmBatchJobProps): HelmBatchJobResult {
         labels: include(`${name}.labels`),
         annotations: toYaml(values.serviceAccount.annotations),
       },
-    };
+    }, defs?.serviceAccount));
   }
 
   if (rbac) {
-    result.role = {
+    result.role = new Role(mergeDefaults({
       apiVersion: "rbac.authorization.k8s.io/v1",
       kind: "Role",
       metadata: {
@@ -183,9 +197,9 @@ export function HelmBatchJob(props: HelmBatchJobProps): HelmBatchJobResult {
         labels: include(`${name}.labels`),
       },
       rules: toYaml(values.rbac.rules),
-    };
+    }, defs?.role));
 
-    result.roleBinding = {
+    result.roleBinding = new RoleBinding(mergeDefaults({
       apiVersion: "rbac.authorization.k8s.io/v1",
       kind: "RoleBinding",
       metadata: {
@@ -202,8 +216,8 @@ export function HelmBatchJob(props: HelmBatchJobProps): HelmBatchJobResult {
         name: include(`${name}.serviceAccountName`),
         namespace: values.namespace ?? undefined,
       }],
-    };
+    }, defs?.roleBinding));
   }
 
   return result;
-}
+}, "HelmBatchJob");

package/src/composites/helm-crd-lifecycle.ts

@@ -6,6 +6,8 @@
  * or deleted.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, Job, ConfigMap, ServiceAccount, ClusterRole, ClusterRoleBinding } from "../resources";
 import { values, include, printf } from "../intrinsics";
 
 export interface HelmCRDLifecycleProps {
@@ -19,38 +21,49 @@ export interface HelmCRDLifecycleProps {
   kubectlTag?: string;
   /** ServiceAccount name for RBAC. */
   serviceAccountName?: string;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    crdInstallJob?: Partial<Record<string, unknown>>;
+    crdConfigMap?: Partial<Record<string, unknown>>;
+    serviceAccount?: Partial<Record<string, unknown>>;
+    clusterRole?: Partial<Record<string, unknown>>;
+    clusterRoleBinding?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmCRDLifecycleResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  crdInstallJob: Record<string, unknown>;
-  crdConfigMap: Record<string, unknown>;
-  serviceAccount: Record<string, unknown>;
-  clusterRole: Record<string, unknown>;
-  clusterRoleBinding: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  crdInstallJob: InstanceType<typeof Job>;
+  crdConfigMap: InstanceType<typeof ConfigMap>;
+  serviceAccount: InstanceType<typeof ServiceAccount>;
+  clusterRole: InstanceType<typeof ClusterRole>;
+  clusterRoleBinding: InstanceType<typeof ClusterRoleBinding>;
 }
 
-export function HelmCRDLifecycle(props: HelmCRDLifecycleProps): HelmCRDLifecycleResult {
+export const HelmCRDLifecycle = Composite<HelmCRDLifecycleProps>((props) => {
   const {
     name,
     crdContent,
     kubectlImage = "bitnami/kubectl",
     kubectlTag = "latest",
     serviceAccountName,
+    defaults: defs,
   } = props;
 
   const saName = serviceAccountName ?? `${name}-crd-installer`;
 
-  const chart = {
+  const chart = new Chart(mergeDefaults({
     apiVersion: "v2",
     name,
     version: "0.1.0",
     type: "application",
     description: `CRD lifecycle management for ${name}`,
-  };
+  }, defs?.chart));
 
-  const valuesObj = {
+  const valuesRes = new Values(mergeDefaults({
     crdLifecycle: {
       enabled: true,
       kubectl: {
@@ -61,7 +74,7 @@ export function HelmCRDLifecycle(props: HelmCRDLifecycleProps): HelmCRDLifecycle
         name: saName,
       },
     },
-  };
+  } as Record<string, unknown>, defs?.values));
 
   const hookAnnotations = {
     "helm.sh/hook": "pre-install,pre-upgrade",
@@ -69,7 +82,7 @@ export function HelmCRDLifecycle(props: HelmCRDLifecycleProps): HelmCRDLifecycle
     "helm.sh/hook-delete-policy": "before-hook-creation",
   };
 
-  const crdConfigMap = {
+  const crdConfigMap = new ConfigMap(mergeDefaults({
     apiVersion: "v1",
     kind: "ConfigMap",
     metadata: {
@@ -80,9 +93,9 @@ export function HelmCRDLifecycle(props: HelmCRDLifecycleProps): HelmCRDLifecycle
     data: {
       "crds.yaml": crdContent,
     },
-  };
+  }, defs?.crdConfigMap));
 
-  const serviceAccount = {
+  const serviceAccount = new ServiceAccount(mergeDefaults({
     apiVersion: "v1",
     kind: "ServiceAccount",
     metadata: {
@@ -90,9 +103,9 @@ export function HelmCRDLifecycle(props: HelmCRDLifecycleProps): HelmCRDLifecycle
       labels: include(`${name}.labels`),
       annotations: hookAnnotations,
     },
-  };
+  }, defs?.serviceAccount));
 
-  const clusterRole = {
+  const clusterRole = new ClusterRole(mergeDefaults({
     apiVersion: "rbac.authorization.k8s.io/v1",
     kind: "ClusterRole",
     metadata: {
@@ -105,9 +118,9 @@ export function HelmCRDLifecycle(props: HelmCRDLifecycleProps): HelmCRDLifecycle
       resources: ["customresourcedefinitions"],
       verbs: ["get", "list", "create", "update", "patch"],
     }],
-  };
+  }, defs?.clusterRole));
 
-  const clusterRoleBinding = {
+  const clusterRoleBinding = new ClusterRoleBinding(mergeDefaults({
     apiVersion: "rbac.authorization.k8s.io/v1",
     kind: "ClusterRoleBinding",
     metadata: {
@@ -125,9 +138,9 @@ export function HelmCRDLifecycle(props: HelmCRDLifecycleProps): HelmCRDLifecycle
       name: values.crdLifecycle.serviceAccount.name,
       namespace: "{{ .Release.Namespace }}",
     }],
-  };
+  }, defs?.clusterRoleBinding));
 
-  const crdInstallJob = {
+  const crdInstallJob = new Job(mergeDefaults({
     apiVersion: "batch/v1",
     kind: "Job",
     metadata: {
@@ -170,15 +183,15 @@ export function HelmCRDLifecycle(props: HelmCRDLifecycleProps): HelmCRDLifecycle
         },
       },
     },
-  };
+  }, defs?.crdInstallJob));
 
   return {
     chart,
-    values: valuesObj,
+    values: valuesRes,
     crdInstallJob,
     crdConfigMap,
     serviceAccount,
     clusterRole,
     clusterRoleBinding,
   };
-}
+}, "HelmCRDLifecycle");

package/src/composites/helm-cron-job.ts

@@ -4,6 +4,8 @@
  * Produces a Helm chart for scheduled batch workloads.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, CronJob, ServiceAccount } from "../resources";
 import { values, include, printf, toYaml, With } from "../intrinsics";
 
 export interface HelmCronJobProps {
@@ -41,16 +43,23 @@ export interface HelmCronJobProps {
   backoffLimit?: number;
   /** Include ServiceAccount. Default: false. */
   serviceAccount?: boolean;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    cronJob?: Partial<Record<string, unknown>>;
+    serviceAccount?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmCronJobResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  cronJob: Record<string, unknown>;
-  serviceAccount?: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  cronJob: InstanceType<typeof CronJob>;
+  serviceAccount?: InstanceType<typeof ServiceAccount>;
 }
 
-export function HelmCronJob(props: HelmCronJobProps): HelmCronJobResult {
+export const HelmCronJob = Composite<HelmCronJobProps>((props) => {
   const {
     name,
     imageRepository = "busybox",
@@ -59,16 +68,17 @@ export function HelmCronJob(props: HelmCronJobProps): HelmCronJobResult {
     restartPolicy = "OnFailure",
     appVersion = "1.0.0",
     serviceAccount = false,
+    defaults: defs,
   } = props;
 
-  const chart = {
+  const chart = new Chart(mergeDefaults({
     apiVersion: "v2",
     name,
     version: "0.1.0",
     appVersion,
     type: "application",
     description: `A Helm chart for ${name} (cron job)`,
-  };
+  }, defs?.chart));
 
   const valuesObj: Record<string, unknown> = {
     image: {
@@ -102,6 +112,8 @@ export function HelmCronJob(props: HelmCronJobProps): HelmCronJobResult {
     };
   }
 
+  const valuesRes = new Values(mergeDefaults(valuesObj, defs?.values));
+
   const containerSpec: Record<string, unknown> = {
     name,
     image: printf("%s:%s", values.image.repository, values.image.tag),
@@ -149,7 +161,7 @@ export function HelmCronJob(props: HelmCronJobProps): HelmCronJobResult {
   if (props.successfulJobsHistoryLimit !== undefined) cronJobSpec.successfulJobsHistoryLimit = values.successfulJobsHistoryLimit;
   if (props.failedJobsHistoryLimit !== undefined) cronJobSpec.failedJobsHistoryLimit = values.failedJobsHistoryLimit;
 
-  const cronJob = {
+  const cronJob = new CronJob(mergeDefaults({
     apiVersion: "batch/v1",
     kind: "CronJob",
     metadata: {
@@ -157,12 +169,12 @@ export function HelmCronJob(props: HelmCronJobProps): HelmCronJobResult {
       labels: include(`${name}.labels`),
     },
     spec: cronJobSpec,
-  };
+  }, defs?.cronJob));
 
-  const result: HelmCronJobResult = { chart, values: valuesObj, cronJob };
+  const result: Record<string, any> = { chart, values: valuesRes, cronJob };
 
   if (serviceAccount) {
-    result.serviceAccount = {
+    result.serviceAccount = new ServiceAccount(mergeDefaults({
       apiVersion: "v1",
       kind: "ServiceAccount",
       metadata: {
@@ -170,8 +182,8 @@ export function HelmCronJob(props: HelmCronJobProps): HelmCronJobResult {
         labels: include(`${name}.labels`),
         annotations: toYaml(values.serviceAccount.annotations),
       },
-    };
+    }, defs?.serviceAccount));
   }
 
   return result;
-}
+}, "HelmCronJob");

package/src/composites/helm-daemon-set.ts

@@ -5,6 +5,8 @@
  * infrastructure that needs to run on every node.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, DaemonSet, ServiceAccount } from "../resources";
 import { values, include, printf, toYaml, If, With } from "../intrinsics";
 
 export interface HelmDaemonSetProps {
@@ -22,16 +24,23 @@ export interface HelmDaemonSetProps {
   serviceAccount?: boolean;
   /** Chart appVersion. */
   appVersion?: string;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    daemonSet?: Partial<Record<string, unknown>>;
+    serviceAccount?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmDaemonSetResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  daemonSet: Record<string, unknown>;
-  serviceAccount?: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  daemonSet: InstanceType<typeof DaemonSet>;
+  serviceAccount?: InstanceType<typeof ServiceAccount>;
 }
 
-export function HelmDaemonSet(props: HelmDaemonSetProps): HelmDaemonSetResult {
+export const HelmDaemonSet = Composite<HelmDaemonSetProps>((props) => {
   const {
     name,
     imageRepository = "fluent/fluent-bit",
@@ -40,16 +49,17 @@ export function HelmDaemonSet(props: HelmDaemonSetProps): HelmDaemonSetResult {
     hostPaths = [],
     serviceAccount = true,
     appVersion = "1.0.0",
+    defaults: defs,
   } = props;
 
-  const chart = {
+  const chart = new Chart(mergeDefaults({
     apiVersion: "v2",
     name,
     version: "0.1.0",
     appVersion,
     type: "application",
     description: `A Helm chart for ${name} DaemonSet`,
-  };
+  }, defs?.chart));
 
   const valuesObj: Record<string, unknown> = {
     image: {
@@ -79,6 +89,8 @@ export function HelmDaemonSet(props: HelmDaemonSetProps): HelmDaemonSetResult {
     };
   }
 
+  const valuesRes = new Values(mergeDefaults(valuesObj, defs?.values));
+
   const containerSpec: Record<string, unknown> = {
     name,
     image: printf("%s:%s", values.image.repository, values.image.tag),
@@ -126,7 +138,7 @@ export function HelmDaemonSet(props: HelmDaemonSetProps): HelmDaemonSetResult {
     }));
   }
 
-  const daemonSet = {
+  const daemonSet = new DaemonSet(mergeDefaults({
     apiVersion: "apps/v1",
     kind: "DaemonSet",
     metadata: {
@@ -145,16 +157,16 @@ export function HelmDaemonSet(props: HelmDaemonSetProps): HelmDaemonSetResult {
         spec: podSpec,
       },
     },
-  };
+  }, defs?.daemonSet));
 
-  const result: HelmDaemonSetResult = {
+  const result: Record<string, any> = {
     chart,
-    values: valuesObj,
+    values: valuesRes,
     daemonSet,
   };
 
   if (serviceAccount) {
-    result.serviceAccount = {
+    result.serviceAccount = new ServiceAccount(mergeDefaults({
       apiVersion: "v1",
       kind: "ServiceAccount",
       metadata: {
@@ -162,8 +174,8 @@ export function HelmDaemonSet(props: HelmDaemonSetProps): HelmDaemonSetResult {
         labels: include(`${name}.labels`),
         annotations: toYaml(values.serviceAccount.annotations),
       },
-    };
+    }, defs?.serviceAccount));
   }
 
   return result;
-}
+}, "HelmDaemonSet");

package/src/composites/helm-external-secret.ts

@@ -9,6 +9,8 @@
  * it like any other K8s resource.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, ExternalSecret } from "../resources";
 import { values, include } from "../intrinsics";
 
 export interface HelmExternalSecretProps {
@@ -22,30 +24,37 @@ export interface HelmExternalSecretProps {
   data: Record<string, string>;
   /** Refresh interval. Default: "1h". */
   refreshInterval?: string;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    externalSecret?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmExternalSecretResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  externalSecret: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  externalSecret: InstanceType<typeof ExternalSecret>;
 }
 
-export function HelmExternalSecret(props: HelmExternalSecretProps): HelmExternalSecretResult {
+export const HelmExternalSecret = Composite<HelmExternalSecretProps>((props) => {
   const {
     name,
     secretStoreName,
     secretStoreKind = "ClusterSecretStore",
     data,
     refreshInterval = "1h",
+    defaults: defs,
   } = props;
 
-  const chart = {
+  const chart = new Chart(mergeDefaults({
     apiVersion: "v2",
     name,
     version: "0.1.0",
     type: "application",
     description: `External secret management for ${name}`,
-  };
+  }, defs?.chart));
 
   const secretDataEntries = Object.entries(data).map(([key, remotePath]) => ({
     secretKey: key,
@@ -54,7 +63,7 @@ export function HelmExternalSecret(props: HelmExternalSecretProps): HelmExternal
     },
   }));
 
-  const valuesObj = {
+  const valuesRes = new Values(mergeDefaults({
     externalSecret: {
       refreshInterval,
       secretStore: {
@@ -62,9 +71,9 @@ export function HelmExternalSecret(props: HelmExternalSecretProps): HelmExternal
         kind: secretStoreKind,
       },
     },
-  };
+  } as Record<string, unknown>, defs?.values));
 
-  const externalSecret = {
+  const externalSecret = new ExternalSecret(mergeDefaults({
     apiVersion: "external-secrets.io/v1beta1",
     kind: "ExternalSecret",
     metadata: {
@@ -83,11 +92,11 @@ export function HelmExternalSecret(props: HelmExternalSecretProps): HelmExternal
       },
       data: secretDataEntries,
     },
-  };
+  }, defs?.externalSecret));
 
   return {
     chart,
-    values: valuesObj,
+    values: valuesRes,
     externalSecret,
   };
-}
+}, "HelmExternalSecret");

package/src/composites/helm-library.ts

@@ -4,6 +4,9 @@
  * Produces a Helm library chart with only Chart.yaml and _helpers.tpl.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values } from "../resources";
+
 export interface HelmLibraryProps {
   /** Chart name. */
   name: string;
@@ -19,23 +22,29 @@ export interface HelmLibraryProps {
   }>;
   /** Helper template names to generate. */
   helpers?: string[];
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    helpers?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmLibraryResult {
-  chart: Record<string, unknown>;
-  helpers: string[];
+  chart: InstanceType<typeof Chart>;
+  helpers: InstanceType<typeof Values>;
 }
 
-export function HelmLibrary(props: HelmLibraryProps): HelmLibraryResult {
+export const HelmLibrary = Composite<HelmLibraryProps>((props) => {
   const {
     name,
     version = "0.1.0",
     description = `A Helm library chart for ${name}`,
     dependencies = [],
     helpers = ["name", "fullname", "chart", "labels", "selectorLabels"],
+    defaults: defs,
   } = props;
 
-  const chart: Record<string, unknown> = {
+  const chartProps: Record<string, unknown> = {
     apiVersion: "v2",
     name,
     version,
@@ -44,8 +53,13 @@ export function HelmLibrary(props: HelmLibraryProps): HelmLibraryResult {
   };
 
   if (dependencies.length > 0) {
-    chart.dependencies = dependencies;
+    chartProps.dependencies = dependencies;
   }
 
-  return { chart, helpers };
-}
+  const chart = new Chart(mergeDefaults(chartProps, defs?.chart));
+
+  // Store helpers list in a Values resource so it's a Declarable member
+  const helpersRes = new Values(mergeDefaults({ helpers }, defs?.helpers));
+
+  return { chart, helpers: helpersRes };
+}, "HelmLibrary");