pepr 0.48.1 → 0.49.0-nightly.1

package/src/lib/assets/helm.ts

@@ -179,6 +179,18 @@ export function admissionDeployTemplate(buildTimestamp: string): string {
               app: {{ .Values.uuid }}
               pepr.dev/controller: admission
           spec:
+            {{- if .Values.admission.antiAffinity }}
+            affinity:
+              podAntiAffinity:
+                requiredDuringSchedulingIgnoredDuringExecution:
+                  - labelSelector:
+                      matchExpressions:
+                        - key: pepr.dev/controller
+                          operator: In
+                          values:
+                            - admission
+                    topologyKey: "kubernetes.io/hostname"
+            {{- end }}
             terminationGracePeriodSeconds: {{ .Values.admission.terminationGracePeriodSeconds }}
             priorityClassName: system-node-critical
             serviceAccountName: {{ .Values.uuid }}
@@ -245,22 +257,23 @@ export function admissionDeployTemplate(buildTimestamp: string): string {
               {{- end }}
     `;
 }
-
-export function serviceMonitorTemplate(name: string): string {
+type ControllerType = "admission" | "watcher";
+export function serviceMonitorTemplate(name: string, type: ControllerType): string {
   return `
-      {{- if .Values.${name}.serviceMonitor.enabled }}
+      {{- if .Values.${type}.serviceMonitor.enabled }}
       apiVersion: monitoring.coreos.com/v1
       kind: ServiceMonitor
       metadata:
         name: ${name}
+        namespace: pepr-system
         annotations:
-          {{- toYaml .Values.${name}.serviceMonitor.annotations | nindent 4 }}
+          {{- toYaml .Values.${type}.serviceMonitor.annotations | nindent 4 }}
         labels:
-          {{- toYaml .Values.${name}.serviceMonitor.labels | nindent 4 }}
+          {{- toYaml .Values.${type}.serviceMonitor.labels | nindent 4 }}
       spec:
         selector:
           matchLabels:
-            pepr.dev/controller: ${name}
+            pepr.dev/controller: ${type}
         namespaceSelector:
           matchNames:
             - pepr-system

package/src/lib/assets/pods.ts

@@ -348,8 +348,7 @@ export function getModuleSecret(name: string, data: Buffer, hash: string): kind.
   const compressedData = compressed.toString("base64");
   if (secretOverLimit(compressedData)) {
     const error = new Error(`Module secret for ${name} is over the 1MB limit`);
-    console.error("Uncaught Exception:", error);
-    process.exit(1);
+    throw error;
   } else {
     return {
       apiVersion: "v1",

package/src/lib/assets/yaml/generateZarfYaml.ts

@@ -4,20 +4,21 @@ import { Assets } from "../assets";
 type ConfigType = "manifests" | "charts";
 
 export function generateZarfYamlGeneric(assets: Assets, path: string, type: ConfigType): string {
+  const zarfComponentName = process.env.PEPR_CUSTOM_BUILD_NAME ?? "module";
   const manifestSettings = {
-    name: "module",
+    name: zarfComponentName,
     namespace: "pepr-system",
     files: [path],
   };
   const chartSettings = {
-    name: "module",
+    name: zarfComponentName,
     namespace: "pepr-system",
     version: `${assets.config.appVersion || "0.0.1"}`,
     localPath: path,
   };
 
   const component = {
-    name: "module",
+    name: zarfComponentName,
     required: true,
     images: [assets.image],
     [type]: [type === "manifests" ? manifestSettings : chartSettings],

package/src/lib/assets/yaml/overridesFile.ts

@@ -37,6 +37,7 @@ export async function overridesFile(
     },
     uuid: name,
     admission: {
+      antiAffinity: false,
       terminationGracePeriodSeconds: 5,
       failurePolicy: config.onError === "reject" ? "Fail" : "Ignore",
       webhookTimeout: config.webhookTimeout,

package/src/lib/controller/createHooks.ts

@@ -0,0 +1,34 @@
+import { ControllerHooks } from ".";
+import { resolveIgnoreNamespaces } from "../assets/webhooks";
+import { Capability } from "../core/capability";
+import { isWatchMode, isDevMode } from "../core/envChecks";
+import { setupWatch } from "../processors/watch-processor";
+import { PeprModuleOptions } from "../types";
+
+/**
+ * Creates controller hooks with proper handling of watch setup
+ *
+ * @param opts Module options including hooks
+ * @param capabilities List of capabilities
+ * @param ignoreNamespaces Namespaces to ignore
+ * @returns Controller hooks configuration
+ */
+export function createControllerHooks(
+  opts: PeprModuleOptions,
+  capabilities: Capability[],
+  ignoreNamespaces: string[] = [],
+): ControllerHooks {
+  return {
+    beforeHook: opts.beforeHook,
+    afterHook: opts.afterHook,
+    onReady: async (): Promise<void> => {
+      if (isWatchMode() || isDevMode()) {
+        try {
+          setupWatch(capabilities, resolveIgnoreNamespaces(ignoreNamespaces));
+        } catch (error) {
+          throw new Error(`WatchError: Could not set up watch.`, { cause: error });
+        }
+      }
+    },
+  };
+}

package/src/lib/controller/index.ts

@@ -132,10 +132,10 @@ export class Controller {
 
     // Listen for the SIGTERM signal and gracefully close the server
     process.on("SIGTERM", () => {
-      Log.info("Received SIGTERM, closing server");
+      Log.info("Received SIGTERM, closing server.");
       server.close(() => {
-        Log.info("Server closed");
-        process.exit(0);
+        Log.info("Server closed.");
+        process.exit(143);
       });
     });
   };

package/src/lib/core/module.ts

@@ -2,14 +2,12 @@
 // SPDX-FileCopyrightText: 2023-Present The Pepr Authors
 import { clone } from "ramda";
 import { Capability } from "./capability";
-import { Controller, ControllerHooks } from "../controller";
+import { Controller } from "../controller";
 import { ValidateError } from "../errors";
 import { CapabilityExport } from "../types";
-import { setupWatch } from "../processors/watch-processor";
-import Log from "../../lib/telemetry/logger";
-import { resolveIgnoreNamespaces } from "../assets/webhooks";
-import { isBuildMode, isDevMode, isWatchMode } from "./envChecks";
+import { isBuildMode } from "./envChecks";
 import { PackageJSON, PeprModuleOptions, ModuleConfig } from "../types";
+import { createControllerHooks } from "../controller/createHooks";
 
 export class PeprModule {
   #controller!: Controller;
@@ -59,21 +57,11 @@ export class PeprModule {
       return;
     }
 
-    const controllerHooks: ControllerHooks = {
-      beforeHook: opts.beforeHook,
-      afterHook: opts.afterHook,
-      onReady: async (): Promise<void> => {
-        // Wait for the controller to be ready before setting up watches
-        if (isWatchMode() || isDevMode()) {
-          try {
-            setupWatch(capabilities, resolveIgnoreNamespaces(pepr?.alwaysIgnore?.namespaces));
-          } catch (e) {
-            Log.error(e, "Error setting up watch");
-            process.exit(1);
-          }
-        }
-      },
-    };
+    const controllerHooks = createControllerHooks(
+      opts,
+      capabilities,
+      pepr?.alwaysIgnore?.namespaces,
+    );
 
     this.#controller = new Controller(config, capabilities, controllerHooks);