fix(createDeployment): handle request/limits

SocialGouv · Jul 27, 2020 · 25f7ae5 · 25f7ae5
1 parent 0c49448
commit 25f7ae5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap
@@ -79,11 +79,11 @@ spec:
             timeoutSeconds: 1
           resources:
             limits:
-              cpu: 500m
+              cpu: 50m
               memory: 128Mi
             requests:
-              cpu: 5m
-              memory: 16Mi
+              cpu: 1m
+              memory: 64Mi
           startupProbe:
             failureThreshold: 12
             httpGet:

diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap
@@ -79,11 +79,11 @@ spec:
             timeoutSeconds: 1
           resources:
             limits:
-              cpu: 500m
+              cpu: 50m
               memory: 128Mi
             requests:
-              cpu: 5m
-              memory: 16Mi
+              cpu: 1m
+              memory: 64Mi
           startupProbe:
             failureThreshold: 12
             httpGet:

diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap
@@ -61,11 +61,11 @@ spec:
             timeoutSeconds: 1
           resources:
             limits:
-              cpu: 500m
+              cpu: 50m
               memory: 128Mi
             requests:
-              cpu: 5m
-              memory: 16Mi
+              cpu: 1m
+              memory: 64Mi
           startupProbe:
             failureThreshold: 12
             httpGet:

diff --git a/src/utils/createDeployment.ts b/src/utils/createDeployment.ts
@@ -1,5 +1,5 @@
 import { IIoK8sApiCoreV1Probe } from "kubernetes-models/_definitions/IoK8sApiCoreV1Probe";
-import { IoK8sApiCoreV1ResourceRequirements } from "kubernetes-models/_definitions/IoK8sApiCoreV1ResourceRequirements";
+import { IIoK8sApimachineryPkgApiResourceQuantity } from "kubernetes-models/_definitions/IoK8sApimachineryPkgApiResourceQuantity";
 //import { IIoK8sApimachineryPkgApisMetaV1ObjectMeta } from "kubernetes-models/_definitions/IoK8sApimachineryPkgApisMetaV1ObjectMeta";
 import { Deployment } from "kubernetes-models/apps/v1/Deployment";
 
@@ -9,7 +9,12 @@ interface DeploymentParams {
   //metadata: IIoK8sApimachineryPkgApisMetaV1ObjectMeta;
   image: string;
   // { name: string | undefined; tag: string | undefined };
-  resources: IoK8sApiCoreV1ResourceRequirements | null;
+  limits?: {
+    [key: string]: IIoK8sApimachineryPkgApiResourceQuantity;
+  };
+  requests?: {
+    [key: string]: IIoK8sApimachineryPkgApiResourceQuantity;
+  };
   livenessProbe: IIoK8sApiCoreV1Probe | null;
   readinessProbe: IIoK8sApiCoreV1Probe | null;
 }
@@ -85,12 +90,12 @@ export default (params: DeploymentParams): Deployment => {
                 limits: {
                   cpu: "500m",
                   memory: "128Mi",
-                  //   ...(params.limits ?? {}),
+                  ...(params.limits ?? {}),
                 },
                 requests: {
                   cpu: "5m",
                   memory: "16Mi",
-                  //  ...(params.requests ?? {}),
+                  ...(params.requests ?? {}),
                 },
               },
               startupProbe: {