Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social

deployment/configurations/stage.ocelot.social

@@ -1 +1 @@
-Subproject commit 540bd503b9401c1608ccda77bdd23fe47ba008fb
+Subproject commit b3f7838c2612a81b031c2ab7b372d0c66e8b9466

deployment/src/kubernetes/templates/backend/Deployment.yaml

@@ -39,6 +39,11 @@ spec:
             name: configmap-{{ .Release.Name }}-backend
         - secretRef:
             name: secret-{{ .Release.Name }}-backend
+        resources:
+          requests:
+            memory: {{ .Values.BACKEND.RESOURCE_REQUESTS_MEMORY | default "1G" | quote }}
+          limits:
+            memory: {{ .Values.BACKEND.RESOURCE_LIMITS_MEMORY | default "2G" | quote }}
         ports:
         - containerPort: 4000
           protocol: TCP

deployment/src/kubernetes/templates/maintenance/Deployment.yaml

@@ -34,6 +34,11 @@ spec:
               name: configmap-{{ .Release.Name }}-webapp
           - secretRef:
               name: secret-{{ .Release.Name }}-webapp
+        resources:
+          requests:
+            memory: {{ .Values.MAINTENANCE.RESOURCE_REQUESTS_MEMORY | default "500M" | quote }}
+          limits:
+            memory: {{ .Values.MAINTENANCE.RESOURCE_LIMITS_MEMORY | default "1G" | quote }}
         ports:
           - containerPort: 80
       restartPolicy: {{ .Values.MAINTENANCE.CONTAINER_RESTART_POLICY }}

deployment/src/kubernetes/templates/webapp/Deployment.yaml

@@ -40,5 +40,10 @@ spec:
             name: configmap-{{ .Release.Name }}-webapp
         - secretRef:
             name: secret-{{ .Release.Name }}-webapp
+        resources:
+          requests:
+            memory: {{ .Values.WEBAPP.RESOURCE_REQUESTS_MEMORY | default "1G" | quote }}
+          limits:
+            memory: {{ .Values.WEBAPP.RESOURCE_LIMITS_MEMORY | default "2G" | quote }}
       restartPolicy: {{ .Values.WEBAPP.CONTAINER_RESTART_POLICY }}
       terminationGracePeriodSeconds: {{ .Values.WEBAPP.CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS }}

webapp/package.json

@@ -38,7 +38,7 @@
     "express": "~4.17.1",
     "graphql": "~14.7.0",
     "intersection-observer": "^0.12.0",
-    "jsonwebtoken": "~8.5.1",
+    "jsonwebtoken": "~9.0.0",
     "linkify-it": "~3.0.2",
     "mapbox-gl": "1.13.2",
     "node-fetch": "^2.6.1",
@@ -65,7 +65,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "~7.12.3",
+    "@babel/core": "~7.21.4",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.20.2",
     "@faker-js/faker": "5.1.0",
@@ -100,7 +100,7 @@
     "eslint-plugin-vue": "~6.2.2",
     "flush-promises": "^1.0.2",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "29.4",
+    "jest": "29.5",
     "jest-environment-jsdom": "^29.4.2",
     "mutation-observer": "^1.0.3",
     "prettier": "~2.7.1",