@crossdelta/infrastructure 0.8.6 → 0.10.0

package/README.md

@@ -3,17 +3,58 @@
 [![npm version](https://img.shields.io/npm/v/@crossdelta/infrastructure.svg)](https://www.npmjs.com/package/@crossdelta/infrastructure)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-Opinionated Pulumi abstractions for deploying microservices to Kubernetes. Turns per-service config objects into Deployments, Services, Ingress, probes, and secrets.
+Pulumi abstractions that turn per-service config objects into complete Kubernetes deployments. You describe **what** each service needs (ports, env, secrets, health checks), the package handles **how** (Deployments, Services, Ingress, TLS, probes, pull secrets).
 
-## Installation
+**What you skip writing:**
+- Boilerplate K8s YAML / Pulumi resource declarations per service
+- NATS JetStream + cert-manager + NGINX Ingress setup
+- Docker registry secrets, health probes, rolling update strategies
+- Multi-environment concerns (shared cluster, per-stack namespaces)
+
+## Install
 
 ```bash
 npm install @crossdelta/infrastructure @pulumi/pulumi @pulumi/kubernetes
 ```
 
-## Usage
+## End-to-End Example
 
-### Service config
+One `index.ts` that provisions a cluster, runtime, and all services:
+
+```typescript
+import {
+  createDOKSCluster,
+  createVPC,
+  createNamespace,
+  deployRuntime,
+  deployK8sServices,
+  discoverServiceConfigs,
+} from '@crossdelta/infrastructure'
+
+// 1. Cluster
+const vpc = createVPC({ name: 'my-vpc', region: 'fra1' })
+const { provider } = createDOKSCluster({
+  name: 'my-cluster',
+  vpcUuid: vpc.id,
+  nodePool: { name: 'default', size: 's-4vcpu-8gb', nodeCount: 1 },
+})
+createNamespace(provider, 'my-namespace')
+
+// 2. Runtime (toggle what you need)
+const runtime = deployRuntime(provider, 'my-namespace', {
+  nats: { enabled: true, config: { replicas: 1, jetstream: { enabled: true } } },
+  ingress: { enabled: true },
+  certManager: { enabled: true, config: { email: 'ops@example.com' } },
+})
+
+// 3. Services (auto-discovered from infra/services/*.ts)
+const configs = discoverServiceConfigs('services')
+deployK8sServices(provider, 'my-namespace', configs)
+```
+
+## Service Config
+
+Each file in `infra/services/` exports one config. The package derives Deployment, Service, Ingress, Secret, and probes from it:
 
 ```typescript
 import { ports, type K8sServiceConfig } from '@crossdelta/infrastructure'
@@ -21,14 +62,9 @@ import { ports, type K8sServiceConfig } from '@crossdelta/infrastructure'
 const config: K8sServiceConfig = {
   name: 'my-service',
   ports: ports().http(4000).public().build(),
-  replicas: 1,
-  healthCheck: {
-    httpPath: '/health',
-    readinessPath: '/health/ready',
-  },
+  healthCheck: { httpPath: '/health' },
   ingress: { path: '/api', host: 'example.com' },
   env: { DATABASE_URL: dbUrl },
-  containerEnv: { NODE_OPTIONS: '--max-old-space-size=384' },
   secrets: { API_KEY: apiKey },
   resources: {
     requests: { cpu: '50m', memory: '64Mi' },
@@ -39,104 +75,30 @@ const config: K8sServiceConfig = {
 export default config
 ```
 
-### Deploy services
+See `K8sServiceConfig` type for all available fields (replicas, volumes, strategy, containerEnv, etc.).
 
-```typescript
-import { deployK8sServices, discoverServiceConfigs } from '@crossdelta/infrastructure'
-
-const serviceConfigs = discoverServiceConfigs('services')
+## Shared Cluster (Multi-Stack)
 
-deployK8sServices({
-  provider,
-  namespace,
-  serviceConfigs,
-  env: { NATS_URL: natsUrl },
-})
-```
-
-### Deploy runtime components
+When multiple Pulumi stacks share one cluster, use `clusterName`/`vpcName` to pin the DigitalOcean resource name (default appends the stack name):
 
 ```typescript
-import { deployRuntime } from '@crossdelta/infrastructure'
-
-const runtime = deployRuntime(provider, namespace, {
-  nats: { enabled: true, config: { replicas: 1, jetstream: { enabled: true } } },
-  ingress: {
-    enabled: true,
-    config: {
-      nginxConfig: {
-        'proxy-buffer-size': '16k', // Increase for large auth cookies/JWTs
-      },
-    },
-  },
-  certManager: { enabled: true, config: { email: 'ops@example.com' } },
+// Stack A (stage) — owns the cluster
+const { provider, kubeconfig } = createDOKSCluster({
+  name: 'my-cluster',
+  clusterName: 'my-cluster',
+  vpcUuid: vpc.id,
+  nodePool: { name: 'default', size: 's-4vcpu-8gb', nodeCount: 1 },
 })
+export const clusterKubeconfig = kubeconfig
+
+// Stack B (production) — references the shared cluster
+const stageStack = new StackReference('org/project/stage')
+const provider = createK8sProviderFromKubeconfig(
+  'production',
+  stageStack.getOutput('clusterKubeconfig'),
+)
 ```
 
-## K8sServiceConfig
-
-```typescript
-interface K8sServiceConfig {
-  name: string
-  ports: PortConfig
-  replicas?: number
-  resources?: {
-    requests?: { cpu: string; memory: string }
-    limits?: { cpu: string; memory: string }
-  }
-  healthCheck?: {
-    httpPath: string
-    readinessPath?: string       // Falls back to httpPath
-    initialDelaySeconds?: number // Default: 10
-    periodSeconds?: number       // Default: 10
-    failureThreshold?: number    // Default: 3
-  }
-  ingress?: {
-    path: string
-    host?: string
-  }
-  env?: Record<string, pulumi.Input<string>>
-  containerEnv?: Record<string, pulumi.Input<string>>
-  secrets?: Record<string, pulumi.Input<string>>
-  image?: string
-  skip?: boolean
-}
-```
-
-## Fluent Ports API
-
-```typescript
-import { ports } from '@crossdelta/infrastructure'
-
-ports().http(4000).build()                          // Simple HTTP
-ports().http(4000).public().build()                 // Public (ingress)
-ports().grpc(50051).build()                         // gRPC
-ports().http(4000).addHttp(8080, 'metrics').build() // Multiple ports
-```
-
-| Method | Description |
-|--------|-------------|
-| `.http(port)` | HTTP primary port |
-| `.grpc(port)` | gRPC primary port |
-| `.primary(port, name?)` | Custom primary port |
-| `.add(port, name?, protocol?)` | Additional port |
-| `.addHttp(port, name?)` | Additional HTTP port |
-| `.addGrpc(port, name?)` | Additional gRPC port |
-| `.public()` | Expose via ingress |
-| `.protocol(type)` | Set protocol (TCP, UDP, SCTP) |
-| `.build()` | Build config |
-
-## API Reference
-
-| Function | Description |
-|----------|-------------|
-| `deployRuntime(provider, ns, config)` | Deploy runtime components |
-| `discoverServiceConfigs(dir, opts?)` | Auto-discover service configs from filesystem |
-| `deployK8sServices(opts)` | Deploy services to cluster |
-| `createNamespace(provider, name)` | Create k8s namespace |
-| `createImagePullSecret(...)` | Create registry pull secret |
-| `ports()` | Fluent port builder |
-
 ## License
 
 MIT © [crossdelta](https://crossdelta.de)

package/dist/index.cjs

@@ -1139,7 +1139,7 @@ function createDOKSCluster(config) {
   const stack = pulumi4.getStack();
   const region = config.region ?? "fra1";
   const cluster = new digitalocean.KubernetesCluster(config.name, {
-    name: `${config.name}-${stack}`,
+    name: config.clusterName ?? `${config.name}-${stack}`,
     region,
     version: config.version ?? "1.32.10-do.0",
     vpcUuid: config.vpcUuid,
@@ -1190,7 +1190,7 @@ function createVPC(config) {
   const stack = pulumi5.getStack();
   const region = config.region ?? "fra1";
   return new digitalocean2.Vpc(config.name, {
-    name: `${config.name}-${stack}`,
+    name: config.vpcName ?? `${config.name}-${stack}`,
     region,
     description: config.description ?? `VPC for ${config.name}`,
     ipRange: config.ipRange
@@ -1240,6 +1240,7 @@ var normalizeK8sConfig = (config) => {
 };
 var DEFAULTS = {
   replicas: 1,
+  progressDeadlineSeconds: 120,
   resources: {
     requests: { cpu: "100m", memory: "128Mi" },
     limits: { cpu: "500m", memory: "512Mi" }
@@ -1451,6 +1452,7 @@ var deployK8sService = (provider, namespace, config) => {
     },
     spec: {
       replicas,
+      progressDeadlineSeconds: normalizedConfig.progressDeadlineSeconds ?? DEFAULTS.progressDeadlineSeconds,
       strategy: {
         type: "RollingUpdate",
         rollingUpdate: {

package/dist/index.js

@@ -1045,7 +1045,7 @@ function createDOKSCluster(config) {
   const stack = pulumi4.getStack();
   const region = config.region ?? "fra1";
   const cluster = new digitalocean.KubernetesCluster(config.name, {
-    name: `${config.name}-${stack}`,
+    name: config.clusterName ?? `${config.name}-${stack}`,
     region,
     version: config.version ?? "1.32.10-do.0",
     vpcUuid: config.vpcUuid,
@@ -1096,7 +1096,7 @@ function createVPC(config) {
   const stack = pulumi5.getStack();
   const region = config.region ?? "fra1";
   return new digitalocean2.Vpc(config.name, {
-    name: `${config.name}-${stack}`,
+    name: config.vpcName ?? `${config.name}-${stack}`,
     region,
     description: config.description ?? `VPC for ${config.name}`,
     ipRange: config.ipRange
@@ -1146,6 +1146,7 @@ var normalizeK8sConfig = (config) => {
 };
 var DEFAULTS = {
   replicas: 1,
+  progressDeadlineSeconds: 120,
   resources: {
     requests: { cpu: "100m", memory: "128Mi" },
     limits: { cpu: "500m", memory: "512Mi" }
@@ -1357,6 +1358,7 @@ var deployK8sService = (provider, namespace, config) => {
     },
     spec: {
       replicas,
+      progressDeadlineSeconds: normalizedConfig.progressDeadlineSeconds ?? DEFAULTS.progressDeadlineSeconds,
       strategy: {
         type: "RollingUpdate",
         rollingUpdate: {

package/dist/runtimes/doks/types.d.ts

@@ -28,8 +28,10 @@ export type Region = digitalocean.Region;
  * ```
  */
 export interface DOKSClusterConfig {
-    /** Cluster name (will be suffixed with stack name) */
+    /** Pulumi resource name (logical, for state tracking) */
     name: string;
+    /** Actual cluster name in DigitalOcean. Defaults to `${name}-${stack}` */
+    clusterName?: string;
     /** DigitalOcean region (defaults to 'fra1') */
     region?: digitalocean.Region | string;
     /** Kubernetes version - use `doctl kubernetes options versions` to list available */
@@ -65,8 +67,10 @@ export interface DOKSClusterConfig {
  * Simplified VPC configuration with stack-aware naming.
  */
 export interface VPCConfig {
-    /** VPC name (will be suffixed with stack name) */
+    /** Pulumi resource name (logical, for state tracking) */
     name: string;
+    /** Actual VPC name in DigitalOcean. Defaults to `${name}-${stack}` */
+    vpcName?: string;
     /** DigitalOcean region (defaults to 'fra1') */
     region?: digitalocean.Region | string;
     /** Optional description */
@@ -268,6 +272,11 @@ export interface K8sServiceConfig {
         /** Max unavailable pods during rollout (default: 1) */
         maxUnavailable?: number;
     };
+    /**
+     * Max seconds for a deployment to make progress before it's considered failed.
+     * Defaults to 120. Kubernetes default is 600.
+     */
+    progressDeadlineSeconds?: number;
     /** Volume mounts for persistent storage */
     volumes?: K8sVolumeMount[];
     /** Command to run (overrides container entrypoint) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossdelta/infrastructure",
-  "version": "0.8.6",
+  "version": "0.10.0",
   "type": "module",
   "license": "MIT",
   "publishConfig": {