fix(strapi): nodeSelector (#113)

* fix(strapi): nodeSelector * plop * fix: test perf * fix(docker): remove devDeps
SocialGouv · Apr 8, 2021 · 33fd2b3 · 33fd2b3
1 parent 14acc49
commit 33fd2b3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/.k8s/__tests__/__snapshots__/dev.ts.snap b/.k8s/__tests__/__snapshots__/dev.ts.snap
@@ -415,7 +415,7 @@ spec:
               cpu: 500m
               memory: 256Mi
             requests:
-              cpu: 100m
+              cpu: 200m
               memory: 128Mi
           startupProbe:
             failureThreshold: 12
@@ -468,6 +468,8 @@ spec:
         - persistentVolumeClaim:
             claimName: 1000jours-strapi-uploads
           name: uploads
+      nodeSelector:
+        workload: les1000jours-strapi
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/.k8s/__tests__/__snapshots__/preprod.ts.snap b/.k8s/__tests__/__snapshots__/preprod.ts.snap
@@ -377,7 +377,7 @@ spec:
               cpu: 500m
               memory: 256Mi
             requests:
-              cpu: 100m
+              cpu: 200m
               memory: 128Mi
           startupProbe:
             failureThreshold: 12
@@ -430,6 +430,8 @@ spec:
         - persistentVolumeClaim:
             claimName: 1000jours-strapi-uploads
           name: uploads
+      nodeSelector:
+        workload: les1000jours-strapi
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/.k8s/__tests__/__snapshots__/prod.ts.snap b/.k8s/__tests__/__snapshots__/prod.ts.snap
@@ -354,7 +354,7 @@ spec:
               cpu: 500m
               memory: 256Mi
             requests:
-              cpu: 100m
+              cpu: 200m
               memory: 128Mi
           startupProbe:
             failureThreshold: 12
@@ -407,6 +407,8 @@ spec:
         - persistentVolumeClaim:
             claimName: 1000jours-strapi-uploads
           name: uploads
+      nodeSelector:
+        workload: les1000jours-strapi
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/.k8s/components/strapi.ts b/.k8s/components/strapi.ts
@@ -64,7 +64,7 @@ const strapiManifests = create("strapi", {
       },
       resources: {
         requests: {
-          cpu: "100m",
+          cpu: "200m",
           memory: "128Mi",
         },
         limits: {
@@ -85,7 +85,7 @@ const strapiManifests = create("strapi", {
 //@ts-expect-error
 const deployment = getManifestByKind(strapiManifests, Deployment) as Deployment;
 
-const pvcName = "1000jours-strapi-uploads"
+const pvcName = "1000jours-strapi-uploads";
 
 if (deployment && deployment?.spec?.template.spec) {
   deployment.spec.template.spec.volumes = [
@@ -96,12 +96,15 @@ if (deployment && deployment?.spec?.template.spec) {
       name: "uploads",
     },
   ];
+  deployment.spec.template.spec.nodeSelector = {
+    workload: "les1000jours-strapi",
+  };
 }
 
 const pvc = new PersistentVolumeClaim({
   metadata: {
     name: pvcName,
-    annotations: {}
+    annotations: {},
   },
   spec: {
     accessModes: ["ReadWriteOnce"],
@@ -110,7 +113,7 @@ const pvc = new PersistentVolumeClaim({
         storage: "1Gi",
       },
     },
-    volumeMode: "Filesystem"
+    volumeMode: "Filesystem",
   },
 });
 

diff --git a/back/strapi/Dockerfile b/back/strapi/Dockerfile
@@ -14,4 +14,6 @@ ENV NODE_ENV production
 RUN yarn build-ts
 RUN yarn build
 
+RUN yarn install --production
+
 CMD ["yarn", "start"]