@crossdelta/infrastructure 0.2.20 → 0.2.22

package/dist/helpers/image.d.ts

@@ -1,11 +1,27 @@
 import type { Output } from '@pulumi/pulumi';
+/**
+ * Gets the full GHCR image URL for a service.
+ *
+ * @param registry - The GHCR registry/org name (e.g., 'orderboss')
+ * @param serviceName - The service name (e.g., 'storefront', 'api-gateway')
+ * @returns Full image URL (e.g., 'ghcr.io/orderboss/storefront:abc123')
+ *
+ * @example
+ * ```typescript
+ * const config: K8sServiceConfig = {
+ *   name: 'storefront',
+ *   image: ghcrImage('orderboss', 'storefront'),
+ * }
+ * ```
+ */
+export declare const ghcrImage: (registry: string, serviceName: string) => string;
 /**
  * Gets the image configuration for a given repository.
  * @param repository - The name of the repository.
  * @returns The image configuration.
- * @deprecated Use project-specific config helper instead
+ * @deprecated Use ghcrImage instead
  */
-export declare const getImage: (repository: string, registryCredentials: Output<string>) => {
+export declare const getImage: (registry: string, repository: string, registryCredentials: Output<string>) => {
     registryType: any;
     registry: string;
     repository: string;

package/dist/helpers/service-builder.d.ts

@@ -5,6 +5,8 @@ export interface BuildServicesOptions {
     serviceConfigs: ServiceConfig[];
     registryCredentials: Output<string>;
     logtailToken: Output<string>;
+    /** GHCR registry/org name (e.g., 'orderboss') */
+    registry: string;
 }
 /**
  * Builds the services array from service configs.

package/dist/index.cjs

@@ -337013,6 +337013,7 @@ var require_kubernetes = __commonJS((exports2) => {
 // lib/index.ts
 var exports_lib = {};
 __export(exports_lib, {
+  ghcrImage: () => ghcrImage,
   getServiceUrl: () => getServiceUrl,
   getServicePort: () => getServicePort2,
   getImage: () => getImage,
@@ -337360,19 +337361,22 @@ var scopeImageTags = (() => {
 var resolveImageTag = (scopeName) => {
   const tag = scopeImageTags[scopeName];
   if (!tag) {
-    console.warn(`No image tag for "${scopeName}", using "latest" as fallback`);
     return "latest";
   }
   return tag;
 };
-var getImage = (repository, registryCredentials) => {
+var ghcrImage = (registry, serviceName) => {
+  const tag = resolveImageTag(serviceName);
+  return `ghcr.io/${registry}/${serviceName}:${tag}`;
+};
+var getImage = (registry, repository, registryCredentials) => {
   const scopeName = repository.split("/").pop();
   if (!scopeName) {
     throw new Error(`Invalid repository name: ${repository}`);
   }
   return {
     registryType: "GHCR",
-    registry: "orderboss",
+    registry,
     repository,
     registryCredentials,
     tag: resolveImageTag(scopeName)
@@ -337380,7 +337384,7 @@ var getImage = (repository, registryCredentials) => {
 };
 // lib/helpers/service-builder.ts
 function buildServices(options) {
-  const { serviceConfigs, registryCredentials, logtailToken } = options;
+  const { serviceConfigs, registryCredentials, logtailToken, registry } = options;
   const logDestinations = createLogDestinations(logtailToken);
   const sortedConfigs = [...serviceConfigs].sort((a, b) => {
     if (a.ingressPrefix === "/")
@@ -337400,7 +337404,7 @@ function buildServices(options) {
       runCommand: _runCommand,
       ...serviceConfig
     } = config;
-    const image = configImage ?? getImage(`platform/${config.name}`, registryCredentials);
+    const image = configImage ?? getImage(registry, config.name, registryCredentials);
     return {
       healthCheck: defaultHealthCheck,
       alerts: defaultAlerts,
@@ -338028,6 +338032,15 @@ function deployK8sService(provider, namespace, config2) {
     if (config2.ingress.tls?.enabled) {
       ingressAnnotations["cert-manager.io/cluster-issuer"] = config2.ingress.tls.issuerName ?? "letsencrypt-production";
     }
+    let ingressPath = config2.ingress.path;
+    let ingressPathType = config2.ingress.pathType ?? "Prefix";
+    const shouldStripPrefix = config2.ingress.path !== "/" && !config2.ingress.keepPrefix;
+    if (shouldStripPrefix) {
+      ingressPath = `${config2.ingress.path}(/|$)(.*)`;
+      ingressPathType = "ImplementationSpecific";
+      ingressAnnotations["nginx.ingress.kubernetes.io/use-regex"] = "true";
+      ingressAnnotations["nginx.ingress.kubernetes.io/rewrite-target"] = "/$2";
+    }
     const tlsSecretName = config2.ingress.tls?.secretName ?? `${config2.name}-tls`;
     const ingressRules = [];
     const createRule = (host) => ({
@@ -338035,8 +338048,8 @@ function deployK8sService(provider, namespace, config2) {
       http: {
         paths: [
           {
-            path: config2.ingress.path,
-            pathType: config2.ingress.pathType ?? "Prefix",
+            path: ingressPath,
+            pathType: ingressPathType,
             backend: {
               service: {
                 name: config2.name,

package/dist/index.js

@@ -337285,19 +337285,22 @@ var scopeImageTags = (() => {
 var resolveImageTag = (scopeName) => {
   const tag = scopeImageTags[scopeName];
   if (!tag) {
-    console.warn(`No image tag for "${scopeName}", using "latest" as fallback`);
     return "latest";
   }
   return tag;
 };
-var getImage = (repository, registryCredentials) => {
+var ghcrImage = (registry, serviceName) => {
+  const tag = resolveImageTag(serviceName);
+  return `ghcr.io/${registry}/${serviceName}:${tag}`;
+};
+var getImage = (registry, repository, registryCredentials) => {
   const scopeName = repository.split("/").pop();
   if (!scopeName) {
     throw new Error(`Invalid repository name: ${repository}`);
   }
   return {
     registryType: "GHCR",
-    registry: "orderboss",
+    registry,
     repository,
     registryCredentials,
     tag: resolveImageTag(scopeName)
@@ -337305,7 +337308,7 @@ var getImage = (repository, registryCredentials) => {
 };
 // lib/helpers/service-builder.ts
 function buildServices(options) {
-  const { serviceConfigs, registryCredentials, logtailToken } = options;
+  const { serviceConfigs, registryCredentials, logtailToken, registry } = options;
   const logDestinations = createLogDestinations(logtailToken);
   const sortedConfigs = [...serviceConfigs].sort((a, b) => {
     if (a.ingressPrefix === "/")
@@ -337325,7 +337328,7 @@ function buildServices(options) {
       runCommand: _runCommand,
       ...serviceConfig
     } = config;
-    const image = configImage ?? getImage(`platform/${config.name}`, registryCredentials);
+    const image = configImage ?? getImage(registry, config.name, registryCredentials);
     return {
       healthCheck: defaultHealthCheck,
       alerts: defaultAlerts,
@@ -337953,6 +337956,15 @@ function deployK8sService(provider, namespace, config2) {
     if (config2.ingress.tls?.enabled) {
       ingressAnnotations["cert-manager.io/cluster-issuer"] = config2.ingress.tls.issuerName ?? "letsencrypt-production";
     }
+    let ingressPath = config2.ingress.path;
+    let ingressPathType = config2.ingress.pathType ?? "Prefix";
+    const shouldStripPrefix = config2.ingress.path !== "/" && !config2.ingress.keepPrefix;
+    if (shouldStripPrefix) {
+      ingressPath = `${config2.ingress.path}(/|$)(.*)`;
+      ingressPathType = "ImplementationSpecific";
+      ingressAnnotations["nginx.ingress.kubernetes.io/use-regex"] = "true";
+      ingressAnnotations["nginx.ingress.kubernetes.io/rewrite-target"] = "/$2";
+    }
     const tlsSecretName = config2.ingress.tls?.secretName ?? `${config2.name}-tls`;
     const ingressRules = [];
     const createRule = (host) => ({
@@ -337960,8 +337972,8 @@ function deployK8sService(provider, namespace, config2) {
       http: {
         paths: [
           {
-            path: config2.ingress.path,
-            pathType: config2.ingress.pathType ?? "Prefix",
+            path: ingressPath,
+            pathType: ingressPathType,
             backend: {
               service: {
                 name: config2.name,
@@ -338046,6 +338058,7 @@ function buildInternalUrl(serviceName, namespace, port) {
   return `http://${serviceName}.${namespace}.svc.cluster.local:${port}`;
 }
 export {
+  ghcrImage,
   getServiceUrl,
   getServicePort2 as getServicePort,
   getImage,

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

@@ -116,8 +116,18 @@ export interface K8sHealthCheck {
 export interface K8sIngressConfig {
     /** Path prefix for routing (e.g., '/', '/api') */
     path: string;
-    /** Path type: 'Prefix' (default) or 'Exact' */
-    pathType?: 'Prefix' | 'Exact';
+    /** Path type: 'Prefix' (default), 'Exact', or 'ImplementationSpecific' (for regex) */
+    pathType?: 'Prefix' | 'Exact' | 'ImplementationSpecific';
+    /**
+     * Keep the path prefix when forwarding to the service (default: false).
+     *
+     * By default, the path prefix is stripped:
+     *   path='/api': /api/health -> /health
+     *
+     * With keepPrefix=true:
+     *   path='/api': /api/health -> /api/health
+     */
+    keepPrefix?: boolean;
     /** Custom annotations for the ingress */
     annotations?: Record<string, string>;
     /** Hostname for the ingress (required for TLS) */

package/package.json

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