pepr 0.51.6-nightly.1 → 0.51.6-nightly.10

package/src/lib/assets/networking.ts

@@ -35,55 +35,3 @@ export function tlsSecret(name: string, tls: TLSOut): kind.Secret {
     },
   };
 }
-
-export function service(name: string): kind.Service {
-  return {
-    apiVersion: "v1",
-    kind: "Service",
-    metadata: {
-      name,
-      namespace: "pepr-system",
-      labels: {
-        "pepr.dev/controller": "admission",
-      },
-    },
-    spec: {
-      selector: {
-        app: name,
-        "pepr.dev/controller": "admission",
-      },
-      ports: [
-        {
-          port: 443,
-          targetPort: 3000,
-        },
-      ],
-    },
-  };
-}
-
-export function watcherService(name: string): kind.Service {
-  return {
-    apiVersion: "v1",
-    kind: "Service",
-    metadata: {
-      name: `${name}-watcher`,
-      namespace: "pepr-system",
-      labels: {
-        "pepr.dev/controller": "watcher",
-      },
-    },
-    spec: {
-      selector: {
-        app: `${name}-watcher`,
-        "pepr.dev/controller": "watcher",
-      },
-      ports: [
-        {
-          port: 443,
-          targetPort: 3000,
-        },
-      ],
-    },
-  };
-}

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

@@ -4,7 +4,7 @@
 import crypto from "crypto";
 import { Assets } from "../assets";
 import { WebhookType } from "../../enums";
-import { apiPathSecret, service, tlsSecret, watcherService } from "../networking";
+import { apiPathSecret, tlsSecret } from "../networking";
 import {
   clusterRole,
   clusterRoleBinding,
@@ -12,33 +12,60 @@ import {
   storeRole,
   storeRoleBinding,
 } from "../rbac";
-import { dumpYaml, V1Deployment } from "@kubernetes/client-node";
-import { getModuleSecret, getNamespace } from "../pods";
+import { dumpYaml, V1Deployment, V1Service, KubernetesObject } from "@kubernetes/client-node";
+import { getModuleSecret, getNamespace } from "../k8sObjects";
 import { promises as fs } from "fs";
 import { webhookConfigGenerator } from "../webhooks";
 
-type deployments = { default: V1Deployment; watch: V1Deployment | null };
+type deployments = { admission: V1Deployment | null; watch: V1Deployment | null };
+type services = {
+  admission: V1Service | null;
+  watch: V1Service | null;
+};
 
-export async function generateAllYaml(assets: Assets, deployments: deployments): Promise<string> {
+export function pushControllerManifests(
+  resources: KubernetesObject[],
+  deployments: deployments,
+  services: services,
+): KubernetesObject[] {
+  if (deployments.watch) {
+    resources.push(deployments.watch);
+  }
+  if (deployments.admission) {
+    resources.push(deployments.admission);
+  }
+  if (services.admission) {
+    resources.push(services.admission);
+  }
+  if (services.watch) {
+    resources.push(services.watch);
+  }
+  return resources;
+}
+
+export async function generateAllYaml(
+  assets: Assets,
+  deployments: deployments,
+  services: services,
+): Promise<string> {
   const { name, tls, apiPath, path, config } = assets;
   const code = await fs.readFile(path);
   const hash = crypto.createHash("sha256").update(code).digest("hex");
 
-  const resources = [
+  let resources = [
     getNamespace(assets.config.customLabels?.namespace),
     clusterRole(name, assets.capabilities, config.rbacMode, config.rbac),
     clusterRoleBinding(name),
     serviceAccount(name),
     apiPathSecret(name, apiPath),
     tlsSecret(name, tls),
-    deployments.default,
-    service(name),
-    watcherService(name),
     getModuleSecret(name, code, hash),
     storeRole(name),
     storeRoleBinding(name),
   ];
 
+  resources = pushControllerManifests(resources, deployments, services);
+
   const webhooks = {
     mutate: await webhookConfigGenerator(assets, WebhookType.MUTATE, assets.config.webhookTimeout),
     validate: await webhookConfigGenerator(
@@ -48,8 +75,8 @@ export async function generateAllYaml(assets: Assets, deployments: deployments):
     ),
   };
 
-  // Add webhooks and watch deployment if they exist
-  const additionalResources = [webhooks.mutate, webhooks.validate, deployments.watch].filter(
+  // Add webhooks if they exist
+  const additionalResources = [webhooks.mutate, webhooks.validate].filter(
     resource => resource !== null && resource !== undefined,
   );
 

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

@@ -1,4 +1,4 @@
-import { genEnv } from "../envrionment";
+import { genEnv } from "../environment";
 import { CapabilityExport, ModuleConfig } from "../../types";
 import { dumpYaml } from "@kubernetes/client-node";
 import { clusterRole } from "../rbac";
@@ -18,6 +18,7 @@ export async function overridesFile(
   { hash, name, image, config, apiPath, capabilities }: ChartOverrides,
   path: string,
   imagePullSecrets: string[],
+  controllerType: { admission: boolean; watcher: boolean } = { admission: true, watcher: true },
 ): Promise<void> {
   const rbacOverrides = clusterRole(name, capabilities, config.rbacMode, config.rbac).rules;
 
@@ -41,6 +42,7 @@ export async function overridesFile(
     },
     uuid: name,
     admission: {
+      enabled: controllerType.admission === true ? true : false,
       antiAffinity: false,
       terminationGracePeriodSeconds: 5,
       failurePolicy: config.onError === "reject" ? "Fail" : "Ignore",
@@ -110,6 +112,7 @@ export async function overridesFile(
       },
     },
     watcher: {
+      enabled: controllerType.watcher === true ? true : false,
       terminationGracePeriodSeconds: 5,
       env: genEnv(config, true, true),
       envFrom: [],

package/src/templates/tsconfig.module.json

@@ -6,8 +6,8 @@
     "emitDeclarationOnly": true,
     "esModuleInterop": true,
     "lib": ["ES2022"],
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "outDir": "dist",
     "resolveJsonModule": true,
     "rootDir": ".",

package/dist/cli/root.d.ts

@@ -1,5 +0,0 @@
-import { Command } from "commander";
-export declare class RootCmd extends Command {
-    createCommand(name: string): Command;
-}
-//# sourceMappingURL=root.d.ts.map

package/dist/cli/root.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../src/cli/root.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,OAAQ,SAAQ,OAAO;IAElC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAIrC"}

package/dist/lib/assets/envrionment.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"envrionment.d.ts","sourceRoot":"","sources":["../../../src/lib/assets/envrionment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,wBAAgB,MAAM,CACpB,MAAM,EAAE,YAAY,EACpB,SAAS,UAAQ,EACjB,eAAe,UAAQ,GACtB,QAAQ,EAAE,CAkBZ"}

package/dist/lib/assets/pods.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pods.d.ts","sourceRoot":"","sources":["../../../src/lib/assets/pods.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAGhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,yCAAyC;AACzC,wBAAgB,YAAY,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,gBAAgB,CAmBvF;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EACtB,eAAe,CAAC,EAAE,MAAM,GACvB,IAAI,CAAC,UAAU,GAAG,IAAI,CAyJxB;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EACtB,eAAe,CAAC,EAAE,MAAM,GACvB,IAAI,CAAC,UAAU,CA+IjB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAsBrF"}

package/src/cli/root.ts

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-FileCopyrightText: 2023-Present The Pepr Authors
-
-import { Command } from "commander";
-
-export class RootCmd extends Command {
-  // eslint-disable-next-line class-methods-use-this
-  createCommand(name: string): Command {
-    const cmd = new Command(name);
-    return cmd;
-  }
-}