pepr 0.29.1 → 0.30.0

package/dist/lib.js

@@ -50,7 +50,7 @@ var import_kubernetes_fluent_client7 = require("kubernetes-fluent-client");
 var R = __toESM(require("ramda"));
 
 // src/lib/capability.ts
-var import_kubernetes_fluent_client5 = require("kubernetes-fluent-client");
+var import_kubernetes_fluent_client6 = require("kubernetes-fluent-client");
 var import_ramda6 = require("ramda");
 
 // src/lib/logger.ts
@@ -981,11 +981,75 @@ var Controller = class _Controller {
 };
 
 // src/lib/watch-processor.ts
-var import_kubernetes_fluent_client4 = require("kubernetes-fluent-client");
+var import_kubernetes_fluent_client5 = require("kubernetes-fluent-client");
 var import_types2 = require("kubernetes-fluent-client/dist/fluent/types");
 
 // src/lib/helpers.ts
+var import_kubernetes_fluent_client4 = require("kubernetes-fluent-client");
+
+// src/sdk/sdk.ts
+var sdk_exports = {};
+__export(sdk_exports, {
+  containers: () => containers,
+  getOwnerRefFrom: () => getOwnerRefFrom,
+  sanitizeResourceName: () => sanitizeResourceName,
+  writeEvent: () => writeEvent
+});
 var import_kubernetes_fluent_client3 = require("kubernetes-fluent-client");
+function containers(request, containerType) {
+  const containers2 = request.Raw.spec?.containers || [];
+  const initContainers = request.Raw.spec?.initContainers || [];
+  const ephemeralContainers = request.Raw.spec?.ephemeralContainers || [];
+  if (containerType === "containers") {
+    return containers2;
+  }
+  if (containerType === "initContainers") {
+    return initContainers;
+  }
+  if (containerType === "ephemeralContainers") {
+    return ephemeralContainers;
+  }
+  return [...containers2, ...initContainers, ...ephemeralContainers];
+}
+async function writeEvent(cr, event, eventType, eventReason, reportingComponent, reportingInstance) {
+  logger_default.debug(cr.metadata, `Writing event: ${event.message}`);
+  await (0, import_kubernetes_fluent_client3.K8s)(import_kubernetes_fluent_client3.kind.CoreEvent).Create({
+    type: eventType,
+    reason: eventReason,
+    ...event,
+    // Fixed values
+    metadata: {
+      namespace: cr.metadata.namespace,
+      generateName: cr.metadata.name
+    },
+    involvedObject: {
+      apiVersion: cr.apiVersion,
+      kind: cr.kind,
+      name: cr.metadata.name,
+      namespace: cr.metadata.namespace,
+      uid: cr.metadata.uid
+    },
+    firstTimestamp: /* @__PURE__ */ new Date(),
+    reportingComponent,
+    reportingInstance
+  });
+}
+function getOwnerRefFrom(cr) {
+  const { name, uid } = cr.metadata;
+  return [
+    {
+      apiVersion: cr.apiVersion,
+      kind: cr.kind,
+      uid,
+      name
+    }
+  ];
+}
+function sanitizeResourceName(name) {
+  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").slice(0, 250).replace(/^[^a-z]+|[^a-z]+$/g, "");
+}
+
+// src/lib/helpers.ts
 function checkOverlap(bindingFilters, objectFilters) {
   if (Object.keys(bindingFilters).length === 0) {
     return true;
@@ -1098,8 +1162,10 @@ var Queue = class {
 
 // src/lib/watch-processor.ts
 var watchCfg = {
-  retryMax: 5,
-  retryDelaySec: 5
+  retryMax: process.env.PEPR_RETRYMAX ? parseInt(process.env.PEPR_RETRYMAX, 10) : 5,
+  retryDelaySec: process.env.PEPR_RETRYDELAYSECONDS ? parseInt(process.env.PEPR_RETRYDELAYSECONDS, 10) : 5,
+  resyncIntervalSec: process.env.PEPR_RESYNCINTERVALSECONDS ? parseInt(process.env.PEPR_RESYNCINTERVALSECONDS, 10) : 300,
+  allowWatchBookmarks: process.env.PEPR_ALLOWWATCHBOOKMARKS ? process.env.PEPR_ALLOWWATCHBOOKMARKS === "true" : false
 };
 var eventToPhaseMap = {
   ["CREATE" /* Create */]: [import_types2.WatchPhase.Added],
@@ -1115,6 +1181,7 @@ function setupWatch(capabilities) {
 }
 async function runBinding(binding, capabilityNamespaces) {
   const phaseMatch = eventToPhaseMap[binding.event] || eventToPhaseMap["*" /* Any */];
+  logger_default.debug({ watchCfg }, "Effective WatchConfig");
   const watchCallback = async (obj, type) => {
     if (phaseMatch.includes(type)) {
       try {
@@ -1131,7 +1198,7 @@ async function runBinding(binding, capabilityNamespaces) {
   };
   const queue = new Queue();
   queue.setReconcile(watchCallback);
-  const watcher = (0, import_kubernetes_fluent_client4.K8s)(binding.model, binding.filters).Watch(async (obj, type) => {
+  const watcher = (0, import_kubernetes_fluent_client5.K8s)(binding.model, binding.filters).Watch(async (obj, type) => {
     logger_default.debug(obj, `Watch event ${type} received`);
     if (binding.isQueue) {
       await queue.enqueue(obj, type);
@@ -1139,10 +1206,30 @@ async function runBinding(binding, capabilityNamespaces) {
       await watchCallback(obj, type);
     }
   }, watchCfg);
-  watcher.events.on(import_kubernetes_fluent_client4.WatchEvent.GIVE_UP, (err) => {
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.GIVE_UP, (err) => {
     logger_default.error(err, "Watch failed after 5 attempts, giving up");
     process.exit(1);
   });
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.CONNECT, () => logEvent(import_kubernetes_fluent_client5.WatchEvent.CONNECT));
+  watcher.events.on(
+    import_kubernetes_fluent_client5.WatchEvent.BOOKMARK,
+    (obj) => logEvent(import_kubernetes_fluent_client5.WatchEvent.BOOKMARK, "Changes up to the given resourceVersion have been sent.", obj)
+  );
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.DATA_ERROR, (err) => logEvent(import_kubernetes_fluent_client5.WatchEvent.DATA_ERROR, err.message));
+  watcher.events.on(
+    import_kubernetes_fluent_client5.WatchEvent.RESOURCE_VERSION,
+    (resourceVersion) => logEvent(import_kubernetes_fluent_client5.WatchEvent.RESOURCE_VERSION, `Resource version: ${resourceVersion}`)
+  );
+  watcher.events.on(
+    import_kubernetes_fluent_client5.WatchEvent.RECONNECT,
+    (err, retryCount) => logEvent(import_kubernetes_fluent_client5.WatchEvent.RECONNECT, `Reconnecting after ${retryCount} attempts`, err)
+  );
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.RECONNECT_PENDING, () => logEvent(import_kubernetes_fluent_client5.WatchEvent.RECONNECT_PENDING));
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.GIVE_UP, (err) => logEvent(import_kubernetes_fluent_client5.WatchEvent.GIVE_UP, err.message));
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.ABORT, (err) => logEvent(import_kubernetes_fluent_client5.WatchEvent.ABORT, err.message));
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.OLD_RESOURCE_VERSION, (err) => logEvent(import_kubernetes_fluent_client5.WatchEvent.OLD_RESOURCE_VERSION, err));
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.RESYNC, (err) => logEvent(import_kubernetes_fluent_client5.WatchEvent.RESYNC, err.message));
+  watcher.events.on(import_kubernetes_fluent_client5.WatchEvent.NETWORK_ERROR, (err) => logEvent(import_kubernetes_fluent_client5.WatchEvent.NETWORK_ERROR, err.message));
   try {
     await watcher.start();
   } catch (err) {
@@ -1150,6 +1237,13 @@ async function runBinding(binding, capabilityNamespaces) {
     process.exit(1);
   }
 }
+function logEvent(type, message = "", obj) {
+  if (obj) {
+    logger_default.debug(obj, `Watch event ${type} received`, message);
+  } else {
+    logger_default.debug(`Watch event ${type} received`, message);
+  }
+}
 
 // src/lib/module.ts
 var isWatchMode = () => process.env.PEPR_WATCH_MODE === "true";
@@ -1580,7 +1674,7 @@ var Capability = class {
    * @returns
    */
   When = (model, kind4) => {
-    const matchedKind = (0, import_kubernetes_fluent_client5.modelToGroupVersionKind)(model.name);
+    const matchedKind = (0, import_kubernetes_fluent_client6.modelToGroupVersionKind)(model.name);
     if (!matchedKind && !kind4) {
       throw new Error(`Kind not specified for ${model.name}`);
     }
@@ -1685,68 +1779,6 @@ var Capability = class {
     };
   };
 };
-
-// src/sdk/sdk.ts
-var sdk_exports = {};
-__export(sdk_exports, {
-  containers: () => containers,
-  getOwnerRefFrom: () => getOwnerRefFrom,
-  sanitizeResourceName: () => sanitizeResourceName,
-  writeEvent: () => writeEvent
-});
-var import_kubernetes_fluent_client6 = require("kubernetes-fluent-client");
-function containers(request, containerType) {
-  const containers2 = request.Raw.spec?.containers || [];
-  const initContainers = request.Raw.spec?.initContainers || [];
-  const ephemeralContainers = request.Raw.spec?.ephemeralContainers || [];
-  if (containerType === "containers") {
-    return containers2;
-  }
-  if (containerType === "initContainers") {
-    return initContainers;
-  }
-  if (containerType === "ephemeralContainers") {
-    return ephemeralContainers;
-  }
-  return [...containers2, ...initContainers, ...ephemeralContainers];
-}
-async function writeEvent(cr, event, eventType, eventReason, reportingComponent, reportingInstance) {
-  logger_default.debug(cr.metadata, `Writing event: ${event.message}`);
-  await (0, import_kubernetes_fluent_client6.K8s)(import_kubernetes_fluent_client6.kind.CoreEvent).Create({
-    type: eventType,
-    reason: eventReason,
-    ...event,
-    // Fixed values
-    metadata: {
-      namespace: cr.metadata.namespace,
-      generateName: cr.metadata.name
-    },
-    involvedObject: {
-      apiVersion: cr.apiVersion,
-      kind: cr.kind,
-      name: cr.metadata.name,
-      namespace: cr.metadata.namespace,
-      uid: cr.metadata.uid
-    },
-    firstTimestamp: /* @__PURE__ */ new Date(),
-    reportingComponent,
-    reportingInstance
-  });
-}
-function getOwnerRefFrom(cr) {
-  const { name, uid } = cr.metadata;
-  return [
-    {
-      apiVersion: cr.apiVersion,
-      kind: cr.kind,
-      uid,
-      name
-    }
-  ];
-}
-function sanitizeResourceName(name) {
-  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").slice(0, 250).replace(/^[^a-z]+|[^a-z]+$/g, "");
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Capability,