pepr 0.28.2 → 0.28.4

package/package.json

@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "version": "0.28.2",
+  "version": "0.28.4",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
   "scripts": {
@@ -41,7 +41,7 @@
     "ramda": "0.29.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.1.0",
+    "@commitlint/cli": "19.2.0",
     "@commitlint/config-conventional": "19.1.0",
     "@jest/globals": "29.7.0",
     "@types/eslint": "8.56.5",

package/src/lib/assets/pods.ts

@@ -341,17 +341,13 @@ export function moduleSecret(name: string, data: Buffer, hash: string): kind.Sec
 }
 
 function genEnv(config: ModuleConfig, watchMode = false): V1EnvVar[] {
-  const env = [
-    { name: "PEPR_WATCH_MODE", value: watchMode ? "true" : "false" },
-    { name: "PEPR_PRETTY_LOG", value: "false" },
-    { name: "LOG_LEVEL", value: config.logLevel || "debug" },
-  ];
-
-  if (config.env) {
-    for (const [name, value] of Object.entries(config.env)) {
-      env.push({ name, value });
-    }
-  }
+  const def = {
+    PEPR_WATCH_MODE: watchMode ? "true" : "false",
+    PEPR_PRETTY_LOG: "false",
+    LOG_LEVEL: config.logLevel || "debug",
+  };
+  const cfg = config.env || {};
+  const env = Object.entries({ ...def, ...cfg }).map(([name, value]) => ({ name, value }));
 
   return env;
 }

package/src/lib/filter.ts

@@ -16,6 +16,7 @@ export function shouldSkipRequest(binding: Binding, req: AdmissionRequest, capab
   const { group, kind, version } = binding.kind || {};
   const { namespaces, labels, annotations, name } = binding.filters || {};
   const operation = req.operation.toUpperCase();
+  const uid = req.uid;
   // Use the old object if the request is a DELETE operation
   const srcObject = operation === Operation.DELETE ? req.oldObject : req.object;
   const { metadata } = srcObject || {};
@@ -65,7 +66,7 @@ export function shouldSkipRequest(binding: Binding, req: AdmissionRequest, capab
       label = binding.watchCallback!.name;
     }
 
-    logger.debug(`${type} binding (${label}) does not match request namespace "${req.namespace}"`);
+    logger.debug({ uid }, `${type} binding (${label}) does not match request namespace "${req.namespace}"`);
 
     return true;
   }
@@ -76,13 +77,13 @@ export function shouldSkipRequest(binding: Binding, req: AdmissionRequest, capab
 
     // First check if the label exists
     if (!testKey) {
-      logger.debug(`Label ${key} does not exist`);
+      logger.debug({ uid }, `Label ${key} does not exist`);
       return true;
     }
 
     // Then check if the value matches, if specified
     if (value && testKey !== value) {
-      logger.debug(`${testKey} does not match ${value}`);
+      logger.debug({ uid }, `${testKey} does not match ${value}`);
       return true;
     }
   }
@@ -93,13 +94,13 @@ export function shouldSkipRequest(binding: Binding, req: AdmissionRequest, capab
 
     // First check if the annotation exists
     if (!testKey) {
-      logger.debug(`Annotation ${key} does not exist`);
+      logger.debug({ uid }, `Annotation ${key} does not exist`);
       return true;
     }
 
     // Then check if the value matches, if specified
     if (value && testKey !== value) {
-      logger.debug(`${testKey} does not match ${value}`);
+      logger.debug({ uid }, `${testKey} does not match ${value}`);
       return true;
     }
   }

package/src/lib/helpers.ts

@@ -133,6 +133,11 @@ export const createRBACMap = (capabilities: CapabilityExport[]): RBACMap => {
         plural: "peprstores",
       };
 
+      acc["apiextensions.k8s.io/v1/customresourcedefinition"] = {
+        verbs: ["patch", "create"],
+        plural: "customresourcedefinitions",
+      };
+
       if (!acc[key] && binding.isWatch) {
         acc[key] = {
           verbs: ["watch"],