pepr 0.44.0-nightly.2 → 0.44.0-nightly.4

package/package.json

@@ -15,7 +15,7 @@
     "!src/**/*.test.ts",
     "!dist/**/*.test.d.ts*"
   ],
-  "version": "0.44.0-nightly.2",
+  "version": "0.44.0-nightly.4",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
   "scripts": {
@@ -72,9 +72,13 @@
     "husky": "^9.1.6",
     "jest": "29.7.0",
     "js-yaml": "^4.1.0",
+    "shellcheck": "^3.0.0",
     "ts-jest": "29.2.5",
     "undici": "^7.0.1"
   },
+  "overrides": {
+    "glob": "^9.0.0"
+  },
   "peerDependencies": {
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",

package/src/lib/assets/webhooks.ts

@@ -15,7 +15,7 @@ import { Binding } from "../types";
 
 export const peprIgnoreNamespaces: string[] = ["kube-system", "pepr-system"];
 
-const validateRule = (binding: Binding, isMutateWebhook: boolean): V1RuleWithOperations | undefined => {
+export const validateRule = (binding: Binding, isMutateWebhook: boolean): V1RuleWithOperations | undefined => {
   const { event, kind, isMutate, isValidate } = binding;
 
   // Skip invalid bindings based on webhook type

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

@@ -5,17 +5,15 @@ import { dumpYaml } from "@kubernetes/client-node";
 import { clusterRole } from "../rbac";
 import { promises as fs } from "fs";
 
-type CommonOverrideValues = {
+type ChartOverrides = {
   apiToken: string;
   capabilities: CapabilityExport[];
   config: ModuleConfig;
   hash: string;
   name: string;
-};
-
-type ChartOverrides = CommonOverrideValues & {
   image: string;
 };
+
 // Helm Chart overrides file (values.yaml) generated from assets
 export async function overridesFile(
   { hash, name, image, config, apiToken, capabilities }: ChartOverrides,
@@ -34,7 +32,7 @@ export async function overridesFile(
     hash,
     namespace: {
       annotations: {},
-      labels: {
+      labels: config.customLabels?.namespace ?? {
         "pepr.dev": "",
       },
     },

package/src/lib/controller/index.ts

@@ -16,6 +16,12 @@ import { StoreController } from "./store";
 import { AdmissionRequest } from "../types";
 import { karForMutate, karForValidate, KubeAdmissionReview } from "./index.util";
 
+export interface ControllerHooks {
+  beforeHook?: (req: AdmissionRequest) => void;
+  afterHook?: (res: MutateResponse | ValidateResponse) => void;
+  onReady?: () => void;
+}
+
 if (!process.env.PEPR_NODE_WARNINGS) {
   process.removeAllListeners("warning");
 }
@@ -39,13 +45,8 @@ export class Controller {
   readonly #beforeHook?: (req: AdmissionRequest) => void;
   readonly #afterHook?: (res: MutateResponse | ValidateResponse) => void;
 
-  constructor(
-    config: ModuleConfig,
-    capabilities: Capability[],
-    beforeHook?: (req: AdmissionRequest) => void,
-    afterHook?: (res: MutateResponse | ValidateResponse) => void,
-    onReady?: () => void,
-  ) {
+  constructor(config: ModuleConfig, capabilities: Capability[], hooks: ControllerHooks = {}) {
+    const { beforeHook, afterHook, onReady } = hooks;
     this.#config = config;
     this.#capabilities = capabilities;
 

package/src/lib/core/module.ts

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023-Present The Pepr Authors
 import { clone } from "ramda";
 import { Capability } from "./capability";
-import { Controller } from "../controller";
+import { Controller, ControllerHooks } from "../controller";
 import { ValidateError } from "../errors";
 import { MutateResponse, ValidateResponse, WebhookIgnore } from "../k8s";
 import { CapabilityExport, AdmissionRequest } from "../types";
@@ -114,17 +114,23 @@ export class PeprModule {
       return;
     }
 
-    this.#controller = new Controller(config, capabilities, opts.beforeHook, opts.afterHook, () => {
-      // 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: ControllerHooks = {
+      beforeHook: opts.beforeHook,
+      afterHook: opts.afterHook,
+      onReady: (): 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);
+          }
         }
-      }
-    });
+      },
+    };
+
+    this.#controller = new Controller(config, capabilities, controllerHooks);
 
     // Stop processing if deferStart is set to true
     if (opts.deferStart) {

package/src/lib/telemetry/metrics.ts

@@ -66,9 +66,7 @@ export class MetricsCollector {
   #addMetric = <T extends Counter<string> | Gauge<string> | Summary<string>>(
     collection: Map<string, T>,
     MetricType: new (args: MetricArgs) => T,
-    name: string,
-    help: string,
-    labelNames?: string[],
+    { name, help, labelNames }: Omit<MetricArgs, "registers">,
   ): void => {
     if (collection.has(this.#getMetricName(name))) {
       Log.debug(`Metric for ${name} already exists`, loggingPrefix);
@@ -86,15 +84,15 @@ export class MetricsCollector {
   };
 
   addCounter = (name: string, help: string): void => {
-    this.#addMetric(this.#counters, promClient.Counter, name, help, []);
+    this.#addMetric(this.#counters, promClient.Counter, { name, help, labelNames: [] });
   };
 
   addSummary = (name: string, help: string): void => {
-    this.#addMetric(this.#summaries, promClient.Summary, name, help, []);
+    this.#addMetric(this.#summaries, promClient.Summary, { name, help, labelNames: [] });
   };
 
   addGauge = (name: string, help: string, labelNames?: string[]): void => {
-    this.#addMetric(this.#gauges, promClient.Gauge, name, help, labelNames);
+    this.#addMetric(this.#gauges, promClient.Gauge, { name, help, labelNames });
   };
 
   incCounter = (name: string): void => {