@intentius/chant-lexicon-helm 0.0.18 → 0.0.24

package/src/composites/helm-secure-ingress.ts

@@ -5,6 +5,8 @@
  * for automatic certificate provisioning.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, Ingress, Certificate } from "../resources";
 import { values, include, toYaml, If, Range } from "../intrinsics";
 
 export interface HelmSecureIngressProps {
@@ -16,33 +18,41 @@ export interface HelmSecureIngressProps {
   clusterIssuer?: string;
   /** Chart appVersion. */
   appVersion?: string;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    ingress?: Partial<Record<string, unknown>>;
+    certificate?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmSecureIngressResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  ingress: Record<string, unknown>;
-  certificate?: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  ingress: InstanceType<typeof Ingress>;
+  certificate?: InstanceType<typeof Certificate>;
 }
 
-export function HelmSecureIngress(props: HelmSecureIngressProps): HelmSecureIngressResult {
+export const HelmSecureIngress = Composite<HelmSecureIngressProps>((props) => {
   const {
     name,
     ingressClassName = "",
     clusterIssuer = "letsencrypt-prod",
     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} secure ingress`,
-  };
+  }, defs?.chart));
 
-  const valuesObj: Record<string, unknown> = {
+  const valuesRes = new Values(mergeDefaults({
     ingress: {
       enabled: true,
       className: ingressClassName,
@@ -62,53 +72,59 @@ export function HelmSecureIngress(props: HelmSecureIngressProps): HelmSecureIngr
       enabled: true,
       clusterIssuer,
     },
-  };
+  } as Record<string, unknown>, defs?.values));
 
-  const ingress = If(values.ingress.enabled, {
-    apiVersion: "networking.k8s.io/v1",
-    kind: "Ingress",
-    metadata: {
-      name: include(`${name}.fullname`),
-      labels: include(`${name}.labels`),
-      annotations: toYaml(values.ingress.annotations),
-    },
-    spec: {
-      ingressClassName: values.ingress.className,
-      tls: [{
-        secretName: values.ingress.tls.secretName,
-        hosts: Range(values.ingress.hosts, values.ingress.hosts),
-      }],
-      rules: Range(values.ingress.hosts, {
-        host: values.ingress.hosts,
-        http: {
-          paths: values.ingress.hosts,
-        },
-      }),
-    },
-  });
+  const ingress = new Ingress(mergeDefaults(
+    If(values.ingress.enabled, {
+      apiVersion: "networking.k8s.io/v1",
+      kind: "Ingress",
+      metadata: {
+        name: include(`${name}.fullname`),
+        labels: include(`${name}.labels`),
+        annotations: toYaml(values.ingress.annotations),
+      },
+      spec: {
+        ingressClassName: values.ingress.className,
+        tls: [{
+          secretName: values.ingress.tls.secretName,
+          hosts: Range(values.ingress.hosts, values.ingress.hosts),
+        }],
+        rules: Range(values.ingress.hosts, {
+          host: values.ingress.hosts,
+          http: {
+            paths: values.ingress.hosts,
+          },
+        }),
+      },
+    }) as Record<string, unknown>,
+    defs?.ingress,
+  ));
 
   // cert-manager Certificate CRD (cert-manager.io/v1)
-  const certificate = If(values.certManager.enabled, {
-    apiVersion: "cert-manager.io/v1",
-    kind: "Certificate",
-    metadata: {
-      name: include(`${name}.fullname`),
-      labels: include(`${name}.labels`),
-    },
-    spec: {
-      secretName: values.ingress.tls.secretName,
-      issuerRef: {
-        name: values.certManager.clusterIssuer,
-        kind: "ClusterIssuer",
+  const certificate = new Certificate(mergeDefaults(
+    If(values.certManager.enabled, {
+      apiVersion: "cert-manager.io/v1",
+      kind: "Certificate",
+      metadata: {
+        name: include(`${name}.fullname`),
+        labels: include(`${name}.labels`),
       },
-      dnsNames: values.ingress.hosts,
-    },
-  });
+      spec: {
+        secretName: values.ingress.tls.secretName,
+        issuerRef: {
+          name: values.certManager.clusterIssuer,
+          kind: "ClusterIssuer",
+        },
+        dnsNames: values.ingress.hosts,
+      },
+    }) as Record<string, unknown>,
+    defs?.certificate,
+  ));
 
   return {
     chart,
-    values: valuesObj,
-    ingress: ingress as unknown as Record<string, unknown>,
-    certificate: certificate as unknown as Record<string, unknown>,
+    values: valuesRes,
+    ingress,
+    certificate,
   };
-}
+}, "HelmSecureIngress");

package/src/composites/helm-stateful-service.ts

@@ -4,6 +4,8 @@
  * Produces a Helm chart for stateful workloads with persistent storage.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, StatefulSet, Service, ServiceAccount } from "../resources";
 import { values, include, printf, toYaml, With } from "../intrinsics";
 
 export interface HelmStatefulServiceProps {
@@ -43,17 +45,25 @@ export interface HelmStatefulServiceProps {
   serviceAccount?: boolean;
   /** StatefulSet update strategy defaults. */
   updateStrategy?: Record<string, unknown>;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    statefulSet?: Partial<Record<string, unknown>>;
+    service?: Partial<Record<string, unknown>>;
+    serviceAccount?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmStatefulServiceResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  statefulSet: Record<string, unknown>;
-  service: Record<string, unknown>;
-  serviceAccount?: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  statefulSet: InstanceType<typeof StatefulSet>;
+  service: InstanceType<typeof Service>;
+  serviceAccount?: InstanceType<typeof ServiceAccount>;
 }
 
-export function HelmStatefulService(props: HelmStatefulServiceProps): HelmStatefulServiceResult {
+export const HelmStatefulService = Composite<HelmStatefulServiceProps>((props) => {
   const {
     name,
     imageRepository = "postgres",
@@ -64,16 +74,17 @@ export function HelmStatefulService(props: HelmStatefulServiceProps): HelmStatef
     storageClass = "",
     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} (stateful)`,
-  };
+  }, defs?.chart));
 
   const valuesObj: Record<string, unknown> = {
     replicaCount: replicas,
@@ -111,6 +122,8 @@ export function HelmStatefulService(props: HelmStatefulServiceProps): HelmStatef
     };
   }
 
+  const valuesRes = new Values(mergeDefaults(valuesObj, defs?.values));
+
   const containerSpec: Record<string, unknown> = {
     name,
     image: printf("%s:%s", values.image.repository, values.image.tag),
@@ -166,7 +179,7 @@ export function HelmStatefulService(props: HelmStatefulServiceProps): HelmStatef
 
   if (props.updateStrategy) statefulSetSpec.updateStrategy = toYaml(values.updateStrategy);
 
-  const statefulSet = {
+  const statefulSet = new StatefulSet(mergeDefaults({
     apiVersion: "apps/v1",
     kind: "StatefulSet",
     metadata: {
@@ -174,9 +187,9 @@ export function HelmStatefulService(props: HelmStatefulServiceProps): HelmStatef
       labels: include(`${name}.labels`),
     },
     spec: statefulSetSpec,
-  };
+  }, defs?.statefulSet));
 
-  const service = {
+  const service = new Service(mergeDefaults({
     apiVersion: "v1",
     kind: "Service",
     metadata: {
@@ -193,12 +206,12 @@ export function HelmStatefulService(props: HelmStatefulServiceProps): HelmStatef
       }],
       selector: include(`${name}.selectorLabels`),
     },
-  };
+  }, defs?.service));
 
-  const result: HelmStatefulServiceResult = { chart, values: valuesObj, statefulSet, service };
+  const result: Record<string, any> = { chart, values: valuesRes, statefulSet, service };
 
   if (serviceAccount) {
-    result.serviceAccount = {
+    result.serviceAccount = new ServiceAccount(mergeDefaults({
       apiVersion: "v1",
       kind: "ServiceAccount",
       metadata: {
@@ -206,8 +219,8 @@ export function HelmStatefulService(props: HelmStatefulServiceProps): HelmStatef
         labels: include(`${name}.labels`),
         annotations: toYaml(values.serviceAccount.annotations),
       },
-    };
+    }, defs?.serviceAccount));
   }
 
   return result;
-}
+}, "HelmStatefulService");

package/src/composites/helm-web-app.ts

@@ -4,6 +4,8 @@
  * Produces a full set of Helm chart entities with parameterized values references.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, Deployment, Service, ServiceAccount, Ingress, HPA } from "../resources";
 import { values, include, printf, toYaml, If, With } from "../intrinsics";
 
 export interface HelmWebAppProps {
@@ -45,19 +47,29 @@ export interface HelmWebAppProps {
   readinessProbe?: Record<string, unknown>;
   /** Deployment strategy defaults. */
   strategy?: Record<string, unknown>;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    deployment?: Partial<Record<string, unknown>>;
+    service?: Partial<Record<string, unknown>>;
+    serviceAccount?: Partial<Record<string, unknown>>;
+    ingress?: Partial<Record<string, unknown>>;
+    hpa?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmWebAppResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  deployment: Record<string, unknown>;
-  service: Record<string, unknown>;
-  serviceAccount?: Record<string, unknown>;
-  ingress?: Record<string, unknown>;
-  hpa?: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  deployment: InstanceType<typeof Deployment>;
+  service: InstanceType<typeof Service>;
+  serviceAccount?: InstanceType<typeof ServiceAccount>;
+  ingress?: InstanceType<typeof Ingress>;
+  hpa?: InstanceType<typeof HPA>;
 }
 
-export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
+export const HelmWebApp = Composite<HelmWebAppProps>((props) => {
   const {
     name,
     imageRepository = "nginx",
@@ -69,16 +81,17 @@ export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
     autoscaling = true,
     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}`,
-  };
+  }, defs?.chart));
 
   const valuesObj: Record<string, unknown> = {
     replicaCount: replicas,
@@ -131,6 +144,8 @@ export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
     };
   }
 
+  const valuesRes = new Values(mergeDefaults(valuesObj, defs?.values));
+
   const containerSpec: Record<string, unknown> = {
     name,
     image: printf("%s:%s", values.image.repository, values.image.tag),
@@ -170,7 +185,7 @@ export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
 
   if (props.strategy) deploymentSpec.strategy = toYaml(values.strategy);
 
-  const deployment = {
+  const deployment = new Deployment(mergeDefaults({
     apiVersion: "apps/v1",
     kind: "Deployment",
     metadata: {
@@ -178,9 +193,9 @@ export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
       labels: include(`${name}.labels`),
     },
     spec: deploymentSpec,
-  };
+  }, defs?.deployment));
 
-  const service = {
+  const service = new Service(mergeDefaults({
     apiVersion: "v1",
     kind: "Service",
     metadata: {
@@ -197,12 +212,12 @@ export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
       }],
       selector: include(`${name}.selectorLabels`),
     },
-  };
+  }, defs?.service));
 
-  const result: HelmWebAppResult = { chart, values: valuesObj, deployment, service };
+  const result: Record<string, any> = { chart, values: valuesRes, deployment, service };
 
   if (serviceAccount) {
-    result.serviceAccount = {
+    result.serviceAccount = new ServiceAccount(mergeDefaults({
       apiVersion: "v1",
       kind: "ServiceAccount",
       metadata: {
@@ -210,11 +225,11 @@ export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
         labels: include(`${name}.labels`),
         annotations: toYaml(values.serviceAccount.annotations),
       },
-    };
+    }, defs?.serviceAccount));
   }
 
   if (ingress) {
-    result.ingress = {
+    result.ingress = new Ingress(mergeDefaults({
       apiVersion: "networking.k8s.io/v1",
       kind: "Ingress",
       metadata: {
@@ -227,11 +242,11 @@ export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
         rules: values.ingress.hosts,
         tls: values.ingress.tls,
       },
-    };
+    }, defs?.ingress));
   }
 
   if (autoscaling) {
-    result.hpa = {
+    result.hpa = new HPA(mergeDefaults({
       apiVersion: "autoscaling/v2",
       kind: "HorizontalPodAutoscaler",
       metadata: {
@@ -257,8 +272,8 @@ export function HelmWebApp(props: HelmWebAppProps): HelmWebAppResult {
           },
         }],
       },
-    };
+    }, defs?.hpa));
   }
 
   return result;
-}
+}, "HelmWebApp");

package/src/composites/helm-worker.ts

@@ -5,6 +5,8 @@
  * that don't serve HTTP traffic.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { Chart, Values, Deployment, ServiceAccount, HPA, PDB } from "../resources";
 import { values, include, printf, toYaml, If } from "../intrinsics";
 
 export interface HelmWorkerProps {
@@ -22,18 +24,27 @@ export interface HelmWorkerProps {
   pdb?: boolean;
   /** Chart appVersion. */
   appVersion?: string;
+  /** Per-member defaults. */
+  defaults?: {
+    chart?: Partial<Record<string, unknown>>;
+    values?: Partial<Record<string, unknown>>;
+    deployment?: Partial<Record<string, unknown>>;
+    serviceAccount?: Partial<Record<string, unknown>>;
+    hpa?: Partial<Record<string, unknown>>;
+    pdb?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface HelmWorkerResult {
-  chart: Record<string, unknown>;
-  values: Record<string, unknown>;
-  deployment: Record<string, unknown>;
-  serviceAccount: Record<string, unknown>;
-  hpa?: Record<string, unknown>;
-  pdb?: Record<string, unknown>;
+  chart: InstanceType<typeof Chart>;
+  values: InstanceType<typeof Values>;
+  deployment: InstanceType<typeof Deployment>;
+  serviceAccount: InstanceType<typeof ServiceAccount>;
+  hpa?: InstanceType<typeof HPA>;
+  pdb?: InstanceType<typeof PDB>;
 }
 
-export function HelmWorker(props: HelmWorkerProps): HelmWorkerResult {
+export const HelmWorker = Composite<HelmWorkerProps>((props) => {
   const {
     name,
     imageRepository = "worker",
@@ -42,16 +53,17 @@ export function HelmWorker(props: HelmWorkerProps): HelmWorkerResult {
     autoscaling = false,
     pdb = 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} worker`,
-  };
+  }, defs?.chart));
 
   const valuesObj: Record<string, unknown> = {
     replicaCount: replicas,
@@ -101,7 +113,9 @@ export function HelmWorker(props: HelmWorkerProps): HelmWorkerResult {
     };
   }
 
-  const deployment = {
+  const valuesRes = new Values(mergeDefaults(valuesObj, defs?.values));
+
+  const deployment = new Deployment(mergeDefaults({
     apiVersion: "apps/v1",
     kind: "Deployment",
     metadata: {
@@ -137,9 +151,9 @@ export function HelmWorker(props: HelmWorkerProps): HelmWorkerResult {
         },
       },
     },
-  };
+  }, defs?.deployment));
 
-  const serviceAccount = {
+  const serviceAccount = new ServiceAccount(mergeDefaults({
     apiVersion: "v1",
     kind: "ServiceAccount",
     metadata: {
@@ -147,17 +161,17 @@ export function HelmWorker(props: HelmWorkerProps): HelmWorkerResult {
       labels: include(`${name}.labels`),
       annotations: toYaml(values.serviceAccount.annotations),
     },
-  };
+  }, defs?.serviceAccount));
 
-  const result: HelmWorkerResult = {
+  const result: Record<string, any> = {
     chart,
-    values: valuesObj,
+    values: valuesRes,
     deployment,
     serviceAccount,
   };
 
   if (autoscaling) {
-    result.hpa = {
+    result.hpa = new HPA(mergeDefaults({
       apiVersion: "autoscaling/v2",
       kind: "HorizontalPodAutoscaler",
       metadata: {
@@ -183,11 +197,11 @@ export function HelmWorker(props: HelmWorkerProps): HelmWorkerResult {
           },
         }],
       },
-    };
+    }, defs?.hpa));
   }
 
   if (pdb) {
-    result.pdb = {
+    result.pdb = new PDB(mergeDefaults({
       apiVersion: "policy/v1",
       kind: "PodDisruptionBudget",
       metadata: {
@@ -200,8 +214,8 @@ export function HelmWorker(props: HelmWorkerProps): HelmWorkerResult {
           matchLabels: include(`${name}.selectorLabels`),
         },
       },
-    };
+    }, defs?.pdb));
   }
 
   return result;
-}
+}, "HelmWorker");