@intentius/chant-lexicon-k8s 0.0.22 → 0.0.24

package/src/composites/cockroachdb-cluster.ts

@@ -7,6 +7,9 @@
  * CockroachDbCluster per cloud, sharing joinAddresses across clouds.
  */
 
+import { Composite, mergeDefaults } from "@intentius/chant";
+import { StatefulSet, Service, ServiceAccount, Role, RoleBinding, ClusterRole, ClusterRoleBinding, PodDisruptionBudget, Job } from "../generated";
+
 export interface CockroachDbClusterProps {
   /** Cluster name — used in metadata, labels, and service names. */
   name: string;
@@ -34,26 +37,69 @@ export interface CockroachDbClusterProps {
   joinAddresses?: string[];
   /** Enable TLS via self-signed CA certs (default: true). */
   secure?: boolean;
+  /**
+   * Skip the cockroach init Job (default: false).
+   * Set true for secondary regions in a multi-region cluster — only ONE region
+   * should run `cockroach init` to bootstrap the unified cluster. Secondary
+   * nodes start fresh and auto-join the cluster via the joinAddresses.
+   */
+  skipInit?: boolean;
+  /**
+   * Skip the cert-gen Job (default: false).
+   * Set true for multi-region deployments where a shared CA and node certs are
+   * pre-generated externally (e.g. via generate-certs.sh) and distributed via
+   * External Secrets Operator or direct kubectl. Each region's cert-gen creates
+   * a separate CA, breaking cross-region TLS — so all regions must use the same CA.
+   */
+  skipCertGen?: boolean;
+  /**
+   * Extra DNS names / IPs to include in node cert SANs beyond the auto-generated
+   * cluster-local names. Use for cross-region or external hostnames.
+   * E.g. ["cockroachdb-0.east.crdb.internal", "cockroachdb-1.east.crdb.internal"].
+   */
+  extraCertNodeAddresses?: string[];
+  /**
+   * Domain suffix for cross-cluster advertise address (e.g. "east.crdb.internal").
+   * When set, nodes advertise "${HOSTNAME}.${advertiseHostDomain}" instead of the
+   * cluster-local FQDN from $(hostname -f). Required for multi-region clusters so
+   * that gossip addresses are resolvable from other Kubernetes clusters.
+   * E.g. pod "cockroachdb-0" in east advertises "cockroachdb-0.east.crdb.internal".
+   */
+  advertiseHostDomain?: string;
   /** Additional labels to apply to all resources. */
   labels?: Record<string, string>;
+  /** Per-member defaults for fine-grained overrides. */
+  defaults?: {
+    serviceAccount?: Partial<Record<string, unknown>>;
+    role?: Partial<Record<string, unknown>>;
+    roleBinding?: Partial<Record<string, unknown>>;
+    clusterRole?: Partial<Record<string, unknown>>;
+    clusterRoleBinding?: Partial<Record<string, unknown>>;
+    publicService?: Partial<Record<string, unknown>>;
+    headlessService?: Partial<Record<string, unknown>>;
+    pdb?: Partial<Record<string, unknown>>;
+    statefulSet?: Partial<Record<string, unknown>>;
+    initJob?: Partial<Record<string, unknown>>;
+    certGenJob?: Partial<Record<string, unknown>>;
+  };
 }
 
 export interface CockroachDbClusterResult {
-  serviceAccount: Record<string, unknown>;
-  role: Record<string, unknown>;
-  roleBinding: Record<string, unknown>;
-  clusterRole: Record<string, unknown>;
-  clusterRoleBinding: Record<string, unknown>;
+  serviceAccount: InstanceType<typeof ServiceAccount>;
+  role: InstanceType<typeof Role>;
+  roleBinding: InstanceType<typeof RoleBinding>;
+  clusterRole: InstanceType<typeof ClusterRole>;
+  clusterRoleBinding: InstanceType<typeof ClusterRoleBinding>;
   /** Client-facing service (ClusterIP, ports 26257+8080). */
-  publicService: Record<string, unknown>;
+  publicService: InstanceType<typeof Service>;
   /** Pod discovery service (headless, publishNotReadyAddresses). */
-  headlessService: Record<string, unknown>;
-  pdb: Record<string, unknown>;
-  statefulSet: Record<string, unknown>;
-  /** One-shot cockroach init job. */
-  initJob: Record<string, unknown>;
-  /** Generates self-signed CA + node certs, stores in Secrets. */
-  certGenJob: Record<string, unknown>;
+  headlessService: InstanceType<typeof Service>;
+  pdb: InstanceType<typeof PodDisruptionBudget>;
+  statefulSet: InstanceType<typeof StatefulSet>;
+  /** One-shot cockroach init job. Absent when skipInit is true. */
+  initJob?: InstanceType<typeof Job>;
+  /** Generates self-signed CA + node certs, stores in Secrets. Absent when skipCertGen is true. */
+  certGenJob?: InstanceType<typeof Job>;
 }
 
 /**
@@ -77,7 +123,7 @@ export interface CockroachDbClusterResult {
  * });
  * ```
  */
-export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbClusterResult {
+export const CockroachDbCluster = Composite<CockroachDbClusterProps>((props) => {
   const {
     name,
     namespace,
@@ -92,7 +138,12 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
     locality,
     joinAddresses = [],
     secure = true,
+    skipInit = false,
+    skipCertGen = false,
+    extraCertNodeAddresses = [],
+    advertiseHostDomain,
     labels: extraLabels = {},
+    defaults: defs,
   } = props;
 
   const saName = name;
@@ -105,28 +156,28 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
     ...extraLabels,
   };
 
-  // ── RBAC ─────────────────────────────────────────────────────────
+  // -- RBAC --
 
-  const serviceAccount: Record<string, unknown> = {
+  const serviceAccount = new ServiceAccount(mergeDefaults({
     metadata: {
       name: saName,
       ...(namespace && { namespace }),
       labels: { ...commonLabels, "app.kubernetes.io/component": "database" },
     },
-  };
+  }, defs?.serviceAccount));
 
-  const role: Record<string, unknown> = {
+  const role = new Role(mergeDefaults({
     metadata: {
       name,
       ...(namespace && { namespace }),
       labels: { ...commonLabels, "app.kubernetes.io/component": "rbac" },
     },
     rules: [
-      { apiGroups: [""], resources: ["secrets"], verbs: ["get", "create", "patch"] },
+      { apiGroups: [""], resources: ["secrets"], verbs: ["get", "create", "update", "patch"] },
     ],
-  };
+  }, defs?.role));
 
-  const roleBinding: Record<string, unknown> = {
+  const roleBinding = new RoleBinding(mergeDefaults({
     metadata: {
       name,
       ...(namespace && { namespace }),
@@ -140,9 +191,9 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
     subjects: [
       { kind: "ServiceAccount", name: saName, ...(namespace && { namespace }) },
     ],
-  };
+  }, defs?.roleBinding));
 
-  const clusterRole: Record<string, unknown> = {
+  const clusterRole = new ClusterRole(mergeDefaults({
     metadata: {
       name,
       labels: { ...commonLabels, "app.kubernetes.io/component": "rbac" },
@@ -150,9 +201,9 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
     rules: [
       { apiGroups: ["certificates.k8s.io"], resources: ["certificatesigningrequests"], verbs: ["get", "create", "watch"] },
     ],
-  };
+  }, defs?.clusterRole));
 
-  const clusterRoleBinding: Record<string, unknown> = {
+  const clusterRoleBinding = new ClusterRoleBinding(mergeDefaults({
     metadata: {
       name,
       labels: { ...commonLabels, "app.kubernetes.io/component": "rbac" },
@@ -165,11 +216,11 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
     subjects: [
       { kind: "ServiceAccount", name: saName, ...(namespace && { namespace }) },
     ],
-  };
+  }, defs?.clusterRoleBinding));
 
-  // ── Services ────────────────────────────────────────────────────
+  // -- Services --
 
-  const publicService: Record<string, unknown> = {
+  const publicService = new Service(mergeDefaults({
     metadata: {
       name: `${name}-public`,
       ...(namespace && { namespace }),
@@ -183,9 +234,9 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
       ],
       type: "ClusterIP",
     },
-  };
+  }, defs?.publicService));
 
-  const headlessService: Record<string, unknown> = {
+  const headlessService = new Service(mergeDefaults({
     metadata: {
       name,
       ...(namespace && { namespace }),
@@ -203,11 +254,11 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
       clusterIP: "None",
       publishNotReadyAddresses: true,
     },
-  };
+  }, defs?.headlessService));
 
-  // ── PodDisruptionBudget ─────────────────────────────────────────
+  // -- PodDisruptionBudget --
 
-  const pdb: Record<string, unknown> = {
+  const pdb = new PodDisruptionBudget(mergeDefaults({
     metadata: {
       name,
       ...(namespace && { namespace }),
@@ -217,22 +268,31 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
       maxUnavailable: 1,
       selector: { matchLabels: { "app.kubernetes.io/name": name } },
     },
-  };
+  }, defs?.pdb));
+
+  // -- StatefulSet --
 
-  // ── StatefulSet ─────────────────────────────────────────────────
+  // Build the cockroach start command as a shell string so that $(hostname -f)
+  // is expanded at runtime. K8s exec-form args do NOT invoke a shell, so
+  // $(...) substitutions are never evaluated unless we wrap with sh -c.
+  // When advertiseHostDomain is set, advertise the cross-cluster ExternalDNS name
+  // (e.g. "cockroachdb-0.east.crdb.internal") so gossip addresses are resolvable
+  // from other Kubernetes clusters. Otherwise fall back to the cluster-local FQDN.
+  const advertiseHostFlag = advertiseHostDomain
+    ? `--advertise-host=\${HOSTNAME}.${advertiseHostDomain}`
+    : `--advertise-host=$(hostname -f)`;
 
-  const cockroachArgs = [
-    "start",
+  const cockroachFlags = [
     `--logtostderr=WARNING`,
-    `--certs-dir=${secure ? certsDir : ""}`,
-    ...(secure ? [] : ["--insecure"]),
-    `--advertise-host=$(hostname -f)`,
+    ...(secure ? [`--certs-dir=${certsDir}`] : ["--insecure"]),
+    advertiseHostFlag,
     `--http-addr=0.0.0.0`,
     `--cache=${cachePercent}`,
     `--max-sql-memory=${sqlMemoryPercent}`,
     ...(joinAddresses.length > 0 ? [`--join=${joinAddresses.join(",")}`] : []),
     ...(locality ? [`--locality=${locality}`] : []),
   ];
+  const cockroachStartCmd = `/cockroach/cockroach start ${cockroachFlags.join(" ")}`;
 
   const volumes: Record<string, unknown>[] = [];
   const volumeMounts: Record<string, unknown>[] = [
@@ -251,8 +311,8 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
       { containerPort: 26257, name: "grpc" },
       { containerPort: 8080, name: "http" },
     ],
-    command: ["/cockroach/cockroach"],
-    args: cockroachArgs,
+    command: ["/bin/sh", "-c"],
+    args: [cockroachStartCmd],
     resources: {
       limits: { cpu: cpuLimit, memory: memoryLimit },
       requests: { cpu: cpuLimit, memory: memoryLimit },
@@ -274,7 +334,7 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
     },
   };
 
-  const statefulSet: Record<string, unknown> = {
+  const statefulSet = new StatefulSet(mergeDefaults({
     metadata: {
       name,
       ...(namespace && { namespace }),
@@ -318,26 +378,56 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
         },
       ],
     },
-  };
+  }, defs?.statefulSet));
 
-  // ── cert-gen Job ─────────────────────────────────────────────────
+  // -- cert-gen Job --
 
   // Generates self-signed CA and node certs, stores them in K8s Secrets.
   // Each node's cert includes the pod DNS names (pod-N.svc.namespace.svc.cluster.local).
+  // NOTE: The cert-gen Job uses `curl` to create K8s Secrets via the API server.
+  // CockroachDB UBI images (v24+) include curl. For multi-region deployments,
+  // use an external cert generation script instead (see generate-certs.sh).
   const nodeNames = Array.from({ length: replicas }, (_, i) => `${name}-${i}.${name}`);
+  // Include both short names (for in-cluster init job) and FQDNs (for cross-namespace/init connections).
   const nodeAddresses = namespace
-    ? nodeNames.map((n) => `${n}.${namespace}.svc.cluster.local`)
-    : nodeNames.map((n) => `${n}.default.svc.cluster.local`);
+    ? [...nodeNames, ...nodeNames.map((n) => `${n}.${namespace}.svc.cluster.local`)]
+    : [...nodeNames, ...nodeNames.map((n) => `${n}.default.svc.cluster.local`)];
+
+  const ns = namespace ?? "default";
+  const nodeSecretName = `${name}-node-certs`;
+  const clientSecretName = `${name}-client-certs`;
+
+  const allCertNodeAddresses = [...nodeAddresses, ...extraCertNodeAddresses];
 
   const certGenScript = [
     "set -ex",
     "cd /cockroach",
     "cockroach cert create-ca --certs-dir=certs --ca-key=certs/ca.key",
-    `cockroach cert create-node ${nodeAddresses.join(" ")} localhost 127.0.0.1 --certs-dir=certs --ca-key=certs/ca.key`,
+    `cockroach cert create-node ${allCertNodeAddresses.join(" ")} localhost 127.0.0.1 --certs-dir=certs --ca-key=certs/ca.key`,
     "cockroach cert create-client root --certs-dir=certs --ca-key=certs/ca.key",
-  ].join(" && ");
+    // Store certs in K8s Secrets via the API using the ServiceAccount token.
+    `TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)`,
+    `K8S_CA=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt`,
+    `API=https://kubernetes.default.svc`,
+    `NS=${ns}`,
+    `encode() { base64 | tr -d '\\n'; }`,
+    // Build JSON payloads for the two secrets.
+    `NODE_PAYLOAD=$(printf '{"apiVersion":"v1","kind":"Secret","metadata":{"name":"${nodeSecretName}","namespace":"%s"},"type":"Opaque","data":{"ca.crt":"%s","node.crt":"%s","node.key":"%s"}}' "$NS" "$(cat certs/ca.crt | encode)" "$(cat certs/node.crt | encode)" "$(cat certs/node.key | encode)")`,
+    `CLIENT_PAYLOAD=$(printf '{"apiVersion":"v1","kind":"Secret","metadata":{"name":"${clientSecretName}","namespace":"%s"},"type":"Opaque","data":{"ca.crt":"%s","client.root.crt":"%s","client.root.key":"%s"}}' "$NS" "$(cat certs/ca.crt | encode)" "$(cat certs/client.root.crt | encode)" "$(cat certs/client.root.key | encode)")`,
+    // Create or update each secret.
+    `for SECRET_INFO in "${nodeSecretName}:$NODE_PAYLOAD" "${clientSecretName}:$CLIENT_PAYLOAD"; do`,
+    `  SECRET_NAME=\${SECRET_INFO%%:*}`,
+    `  PAYLOAD=\${SECRET_INFO#*:}`,
+    `  STATUS=$(curl -s --cacert $K8S_CA -H "Authorization: Bearer $TOKEN" -o /dev/null -w '%{http_code}' $API/api/v1/namespaces/$NS/secrets/$SECRET_NAME)`,
+    `  if [ "$STATUS" = "200" ]; then`,
+    `    curl -sf --cacert $K8S_CA -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" -X PUT $API/api/v1/namespaces/$NS/secrets/$SECRET_NAME -d "$PAYLOAD"`,
+    `  else`,
+    `    curl -sf --cacert $K8S_CA -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" -X POST $API/api/v1/namespaces/$NS/secrets -d "$PAYLOAD"`,
+    `  fi`,
+    `done`,
+  ].join("\n");
 
-  const certGenJob: Record<string, unknown> = {
+  const certGenJob = skipCertGen ? undefined : new Job(mergeDefaults({
     metadata: {
       name: `${name}-cert-gen`,
       ...(namespace && { namespace }),
@@ -361,9 +451,9 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
         },
       },
     },
-  };
+  }, defs?.certGenJob));
 
-  // ── init Job ────────────────────────────────────────────────────
+  // -- init Job (only when skipCertGen is false) --
 
   const initArgs = secure
     ? [`--certs-dir=${certsDir}`, `--host=${name}-0.${name}`]
@@ -372,11 +462,11 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
   const initVolumes: Record<string, unknown>[] = [];
   const initVolumeMounts: Record<string, unknown>[] = [];
   if (secure) {
-    initVolumes.push({ name: "client-certs", secret: { secretName: `${name}-node-certs`, defaultMode: 0o400 } });
+    initVolumes.push({ name: "client-certs", secret: { secretName: `${name}-client-certs`, defaultMode: 0o400 } });
     initVolumeMounts.push({ name: "client-certs", mountPath: certsDir });
   }
 
-  const initJob: Record<string, unknown> = {
+  const initJob = skipInit ? undefined : new Job(mergeDefaults({
     metadata: {
       name: `${name}-init`,
       ...(namespace && { namespace }),
@@ -403,7 +493,7 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
         },
       },
     },
-  };
+  }, defs?.initJob));
 
   return {
     serviceAccount,
@@ -415,7 +505,7 @@ export function CockroachDbCluster(props: CockroachDbClusterProps): CockroachDbC
     headlessService,
     pdb,
     statefulSet,
-    initJob,
-    certGenJob,
+    ...(initJob && { initJob }),
+    ...(certGenJob && { certGenJob }),
   };
-}
+}, "CockroachDbCluster");