refine PDB and add tests

.projenrc.ts

@@ -10,6 +10,7 @@ const project = new cdk.JsiiProject({
   description: 'Provides a CMS Plone Backend and Frontend for Kubernetes with cdk8s',
   deps: [
     'cdk8s',
+    'cdk8s-plus-24',
     'constructs',
   ],
   peerDeps: [

src/backend-deployment.ts

@@ -34,7 +34,7 @@ export interface PloneBackendDeploymentOptions {
    * If given
    * @default - none
    */
-  readonly pdbOptions?: PlonePDBOptions;
+  readonly pdb?: PlonePDBOptions;
 }
 
 export class PloneBackendDeployment extends Construct {
@@ -73,8 +73,8 @@ export class PloneBackendDeployment extends Construct {
 
     new k8s.KubeDeployment(this, 'deployment', deploymentOptions);
 
-    if (options.pdbOptions ?? false) {
-      const pdbOptions = options.pdbOptions ?? {};
+    if (options.pdb ?? false) {
+      const pdbOptions = options.pdb ?? {};
       new PlonePDB(this, 'pdb', label, pdbOptions);
     }
   }

src/frontend-deployment.ts

@@ -34,7 +34,7 @@ export interface PloneFrontendDeploymentOptions {
    * If given
    * @default - none
    */
-  readonly pdbOptions?: PlonePDBOptions;
+  readonly pdb?: PlonePDBOptions;
 }
 
 export class PloneFrontendDeployment extends Construct {
@@ -74,9 +74,9 @@ export class PloneFrontendDeployment extends Construct {
     new k8s.KubeDeployment(this, 'deployment', deploymentOptions);
 
 
-    if (options.pdbOptions ?? false) {
-      const pdbOptions = options.pdbOptions ?? {};
-      new PlonePDB(this, id + '-pdb', label, pdbOptions);
+    if (options.pdb ?? false) {
+      const pdbOptions = options.pdb ?? {};
+      new PlonePDB(this, 'pdb', label, pdbOptions);
     }
   }
 }

src/pdb.ts

@@ -1,6 +1,6 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Construct } from 'constructs';
-import { IntOrString, KubePodDisruptionBudget } from './imports/k8s';
+import { IntOrString, KubePodDisruptionBudget, PodDisruptionBudgetSpec } from './imports/k8s';
 
 export interface PlonePDBOptions {
   /**
@@ -11,6 +11,7 @@ export interface PlonePDBOptions {
 
   /**
    * minAvailable specification.
+   * default only set if maxUnavailable is not set.
    * @default 1
    */
   readonly minAvailable?: number | string;
@@ -27,28 +28,43 @@ export class PlonePDB extends Construct {
   constructor(scope: Construct, id: string, selectorLabel: { [name: string]: string }, options: PlonePDBOptions) {
     super(scope, id);
 
-    var maxUnavailable: IntOrString = IntOrString.fromString(''); // default value
-    if (typeof maxUnavailable === 'number') {
-      maxUnavailable = IntOrString.fromNumber(options.maxUnavailable as number);
-    } else if (typeof maxUnavailable === 'string') {
-      maxUnavailable = IntOrString.fromString(options.maxUnavailable as string);
+    var spec: PodDisruptionBudgetSpec = {};
+    if (typeof options.maxUnavailable === 'number') {
+      spec = {
+        maxUnavailable: IntOrString.fromNumber(options.maxUnavailable as number),
+      };
+    } else if (typeof options.maxUnavailable === 'string') {
+      spec = {
+        maxUnavailable: IntOrString.fromString(options.maxUnavailable as string),
+      };
     }
-    var minAvailable: IntOrString = IntOrString.fromString(''); // default value
-    if (typeof minAvailable === 'number') {
-      minAvailable = IntOrString.fromNumber(options.minAvailable as number);
-    } else if (typeof minAvailable === 'string') {
-      minAvailable = IntOrString.fromString(options.minAvailable as string);
+    if (typeof options.minAvailable === 'number') {
+      spec = {
+        ...spec,
+        minAvailable: IntOrString.fromNumber(options.minAvailable as number),
+      };
+    } else if (typeof options.minAvailable === 'string') {
+      spec = {
+        ...spec,
+        minAvailable: IntOrString.fromString(options.minAvailable as string),
+      };
     }
+    if (options.maxUnavailable === undefined && options.minAvailable === undefined) {
+      spec = {
+        minAvailable: IntOrString.fromNumber(1),
+      };
+    }
+
+    spec = {
+      ...spec,
+      selector: { matchLabels: selectorLabel },
+    };
 
     new KubePodDisruptionBudget(this, 'PDB', {
       metadata: {
         labels: options.labels ?? {},
       },
-      spec: {
-        selector: { matchLabels: selectorLabel },
-        maxUnavailable: maxUnavailable,
-        minAvailable: minAvailable,
-      },
+      spec: spec,
     });
   }
 }

src/plone.ts

@@ -0,0 +1,20 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { Construct } from 'constructs';
+import { PloneBackend, PloneBackendOptions } from './backend';
+import { PloneFrontend, PloneFrontendOptions } from './frontend';
+
+export interface PloneOptions {
+  readonly frontend?: PloneFrontendOptions;
+  readonly backend?: PloneBackendOptions;
+}
+
+export class Plone extends Construct {
+
+  constructor(scope: Construct, id: string, options: PloneOptions = {}) {
+    super(scope, id);
+    const frontendOptions = options.frontend ?? {};
+    const backendOptions = options.backend ?? {};
+    new PloneBackend(this, 'backend', backendOptions);
+    new PloneFrontend(this, 'frontend', frontendOptions);
+  }
+}