fix service port handling

bluedynamics · Jun 28, 2024 · aee4466 · aee4466
1 parent f2115ed
commit aee4466
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 18 deletions.
diff --git a/API.md b/API.md
diff --git a/src/deployment.ts b/src/deployment.ts
@@ -43,6 +43,18 @@ export interface PloneDeploymentOptions {
  */
   readonly replicas?: number;
 
+  /**
+ * CPU limit
+ * @default 1
+ */
+  readonly limitCpu?: number;
+
+  /**
+ * memory limit
+ * @default 1
+ */
+  readonly limitMemory?: string;
+
   /**
    * Port number.
    */
@@ -100,6 +112,12 @@ export class PloneDeployment extends Construct {
       imagePullPolicy: image.imagePullPolicy,
       env: env,
       envFrom: envFrom,
+      resources: {
+        limits: {
+          cpu: k8s.Quantity.fromNumber(options.limitCpu ?? 1),
+          memory: k8s.Quantity.fromString(options.limitMemory ?? '1Gi'),
+        },
+      },
     };
     const deploymentOptions: k8s.KubeDeploymentProps = {
       metadata: {

diff --git a/src/plone.ts b/src/plone.ts
@@ -10,6 +10,8 @@ export interface PloneBaseOptions {
   readonly replicas?: number;
   readonly maxUnavailable?: number | string;
   readonly minAvailable?: number | string;
+  readonly limitCpu?: number;
+  readonly limitMemory?: string;
   readonly environment?: kplus.Env;
 }
 export interface PloneOptions {
@@ -36,6 +38,8 @@ export class Plone extends Construct {
         imagePullPolicy: backend.imagePullPolicy ?? 'IfNotPresent',
       },
       replicas: backend.replicas,
+      limitCpu: backend.limitCpu ?? 1,
+      limitMemory: backend.limitMemory ?? '512Mi',
       pdb: {
         maxUnavailable: backend.maxUnavailable ?? undefined,
         minAvailable: backend.minAvailable ?? undefined,
@@ -64,6 +68,8 @@ export class Plone extends Construct {
         imagePullPolicy: frontend.imagePullPolicy ?? 'IfNotPresent',
       },
       replicas: frontend.replicas,
+      limitCpu: frontend.limitCpu ?? 1,
+      limitMemory: frontend.limitMemory ?? '1Gi',
       pdb: {
         maxUnavailable: frontend.maxUnavailable ?? undefined,
         minAvailable: frontend.minAvailable ?? undefined,

diff --git a/src/service.ts b/src/service.ts
@@ -36,9 +36,7 @@ export class PloneService extends Construct {
         labels: options.labels ?? {},
       },
       spec: {
-        type: 'ClusterIP',
-        clusterIp: 'None',
-        ports: [{ port: 80, targetPort: targetPort }],
+        ports: [{ port: options.targetPort, targetPort: targetPort, name: 'backend-http' }],
         selector: selectorLabel,
       },
     };

diff --git a/test/__snapshots__/deployment.test.ts.snap b/test/__snapshots__/deployment.test.ts.snap
diff --git a/test/__snapshots__/plone.test.ts.snap b/test/__snapshots__/plone.test.ts.snap
diff --git a/test/__snapshots__/service.test.ts.snap b/test/__snapshots__/service.test.ts.snap