@crossdelta/infrastructure 0.11.7 → 0.11.9

package/dist/index.cjs

@@ -1142,7 +1142,7 @@ var CADDY_DEFAULTS = {
     limits: { cpu: "200m", memory: "256Mi" }
   },
   storage: { size: "1Gi", storageClass: "do-block-storage" },
-  healthCheck: { port: 80, path: "/healthz" }
+  healthCheck: { port: 8080, path: "/healthz" }
 };
 var indent = (text, level) => {
   const prefix = "  ".repeat(level);
@@ -1172,8 +1172,11 @@ var generateHandleBlock = (handle, level, basicAuth) => {
 ${inner}
 }`, level);
 };
-var generateRouteBlock = (route, encode) => {
+var generateRouteBlock = (route, encode, useOnDemandTls) => {
   const body = [];
+  if (useOnDemandTls) {
+    body.push("  tls {", "    on_demand", "  }");
+  }
   if (!route.redirect && encode?.length) {
     body.push(`  encode ${encode.join(" ")}`);
   }
@@ -1232,9 +1235,10 @@ var generateCaddyfile = (config) => {
   const healthCheckBlock = `:${healthCheck.port} {
   respond ${healthCheck.path} 200
 }`;
+  const useOnDemandTls = config.onDemandTls != null;
   const blocks = [
     generateGlobalBlock(config),
-    ...config.routes.map((route) => generateRouteBlock(route, config.encode)),
+    ...config.routes.map((route) => generateRouteBlock(route, config.encode, useOnDemandTls)),
     healthCheckBlock,
     ...config.catchAllUpstream && config.onDemandTls ? [generateCatchAllBlock(config.catchAllUpstream, config.encode)] : []
   ];
@@ -1267,7 +1271,8 @@ var deployCaddy = (provider, namespace, config) => {
     image: "caddy:2-alpine",
     ports: [
       { name: "https", containerPort: 443, protocol: "TCP" },
-      { name: "http", containerPort: 80, protocol: "TCP" }
+      { name: "http", containerPort: 80, protocol: "TCP" },
+      { name: "health", containerPort: healthCheck.port, protocol: "TCP" }
     ],
     resources: buildResourceSpec(config.resources),
     volumeMounts: [
@@ -1324,7 +1329,9 @@ var deployCaddy = (provider, namespace, config) => {
       annotations: {
         "service.beta.kubernetes.io/do-loadbalancer-healthcheck-path": healthCheck.path,
         "service.beta.kubernetes.io/do-loadbalancer-healthcheck-protocol": "http",
-        "service.beta.kubernetes.io/do-loadbalancer-healthcheck-port": String(healthCheck.port)
+        "service.beta.kubernetes.io/do-loadbalancer-healthcheck-port": String(healthCheck.port),
+        "service.beta.kubernetes.io/do-loadbalancer-healthcheck-check-interval-seconds": "3",
+        "service.beta.kubernetes.io/do-loadbalancer-healthcheck-healthy-threshold": "3"
       }
     },
     spec: {

package/dist/index.js

@@ -1046,7 +1046,7 @@ var CADDY_DEFAULTS = {
     limits: { cpu: "200m", memory: "256Mi" }
   },
   storage: { size: "1Gi", storageClass: "do-block-storage" },
-  healthCheck: { port: 80, path: "/healthz" }
+  healthCheck: { port: 8080, path: "/healthz" }
 };
 var indent = (text, level) => {
   const prefix = "  ".repeat(level);
@@ -1076,8 +1076,11 @@ var generateHandleBlock = (handle, level, basicAuth) => {
 ${inner}
 }`, level);
 };
-var generateRouteBlock = (route, encode) => {
+var generateRouteBlock = (route, encode, useOnDemandTls) => {
   const body = [];
+  if (useOnDemandTls) {
+    body.push("  tls {", "    on_demand", "  }");
+  }
   if (!route.redirect && encode?.length) {
     body.push(`  encode ${encode.join(" ")}`);
   }
@@ -1136,9 +1139,10 @@ var generateCaddyfile = (config) => {
   const healthCheckBlock = `:${healthCheck.port} {
   respond ${healthCheck.path} 200
 }`;
+  const useOnDemandTls = config.onDemandTls != null;
   const blocks = [
     generateGlobalBlock(config),
-    ...config.routes.map((route) => generateRouteBlock(route, config.encode)),
+    ...config.routes.map((route) => generateRouteBlock(route, config.encode, useOnDemandTls)),
     healthCheckBlock,
     ...config.catchAllUpstream && config.onDemandTls ? [generateCatchAllBlock(config.catchAllUpstream, config.encode)] : []
   ];
@@ -1171,7 +1175,8 @@ var deployCaddy = (provider, namespace, config) => {
     image: "caddy:2-alpine",
     ports: [
       { name: "https", containerPort: 443, protocol: "TCP" },
-      { name: "http", containerPort: 80, protocol: "TCP" }
+      { name: "http", containerPort: 80, protocol: "TCP" },
+      { name: "health", containerPort: healthCheck.port, protocol: "TCP" }
     ],
     resources: buildResourceSpec(config.resources),
     volumeMounts: [
@@ -1228,7 +1233,9 @@ var deployCaddy = (provider, namespace, config) => {
       annotations: {
         "service.beta.kubernetes.io/do-loadbalancer-healthcheck-path": healthCheck.path,
         "service.beta.kubernetes.io/do-loadbalancer-healthcheck-protocol": "http",
-        "service.beta.kubernetes.io/do-loadbalancer-healthcheck-port": String(healthCheck.port)
+        "service.beta.kubernetes.io/do-loadbalancer-healthcheck-port": String(healthCheck.port),
+        "service.beta.kubernetes.io/do-loadbalancer-healthcheck-check-interval-seconds": "3",
+        "service.beta.kubernetes.io/do-loadbalancer-healthcheck-healthy-threshold": "3"
       }
     },
     spec: {

package/package.json

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