adjust deployment, fix api tests

hpi-schul-cloud · Aug 8, 2024 · a269fe9 · a269fe9
1 parent d3d5150
commit a269fe9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 16 deletions.
diff --git a/ansible/group_vars/develop/shd-client.yml b/ansible/group_vars/develop/shd-client.yml
@@ -1,4 +1,3 @@
 ---
-PORT: 4100
 SHD_CLIENT_IMAGE: ghcr.io/hpi-schul-cloud/shd-client
 SHD_CLIENT_PREFIX: shd2-
diff --git a/ansible/group_vars/all/shd-client.yml → ...e/roles/shd-client-core/defaults/main.yml b/ansible/group_vars/all/shd-client.yml → ...e/roles/shd-client-core/defaults/main.yml
@@ -1,4 +1,3 @@
 ---
-PORT: 4100
 SHD_CLIENT_IMAGE: quay.io/schulcloudverbund/shd-client
 SHD_CLIENT_PREFIX: dashboard2.
diff --git a/ansible/roles/shd-client-core/templates/configmap.yml.j2 b/ansible/roles/shd-client-core/templates/configmap.yml.j2
@@ -7,7 +7,5 @@ metadata:
   labels:
     app: shd-client
 data:
-  # general
-  NODE_ENV: "production"
   TZ: "Europe/Berlin"
   API_URL: "https://{{ DOMAIN }}/api"
diff --git a/ansible/roles/shd-client-core/templates/deployment.yml.j2 b/ansible/roles/shd-client-core/templates/deployment.yml.j2
@@ -82,10 +82,10 @@ spec:
         resources:
           limits:
             cpu: {{ SHD_CLIENT_CPU_LIMITS|default("1000m", true) }}
-            memory: {{ SHD_CLIENT_MEMORY_LIMITS|default("256Mi", true) }}
+            memory: {{ SHD_CLIENT_MEMORY_LIMITS|default("2Gi", true) }}
           requests:
             cpu: {{ SHD_CLIENT_CPU_REQUESTS|default("100m", true) }}
-            memory: {{ SHD_CLIENT_MEMORY_REQUESTS|default("32Mi", true) }}
+            memory: {{ SHD_CLIENT_MEMORY_REQUESTS|default("128Mi", true) }}
 {% if AFFINITY_ENABLE is defined and AFFINITY_ENABLE|bool %}
       affinity:
         podAffinity:

diff --git a/ansible/roles/shd-client-core/templates/ingress.yml.j2 b/ansible/roles/shd-client-core/templates/ingress.yml.j2
@@ -37,4 +37,4 @@ spec:
           service:
             name: shd-client-svc
             port:
-              number: {{ PORT }}
+              number: 4100
diff --git a/ansible/roles/shd-client-core/templates/svc.yml.j2 b/ansible/roles/shd-client-core/templates/svc.yml.j2
@@ -8,7 +8,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ PORT }}
+    - port: 4100
       targetPort: 4100
       protocol: TCP
       name: shd-client

diff --git a/src/modules/data/auth/auth.store.unit.ts b/src/modules/data/auth/auth.store.unit.ts
@@ -1,19 +1,19 @@
-import * as serverApi from "@/serverApi/v3/api";
+import * as serverMeApi from "@/serverApi/v3/api/me-api";
 import { meResponseFactory } from "@@/tests/test-utils/factory";
 import { mockApiResponse } from "@@/tests/test-utils/mockApiResponse";
 import { createMock, DeepMocked } from "@golevelup/ts-jest";
 import { createPinia, setActivePinia } from "pinia";
 import { useAuthStore } from "./auth.store";
 
 describe("AuthStore", () => {
-	let meApi: DeepMocked<serverApi.MeApiInterface>;
+	let meApi: DeepMocked<serverMeApi.MeApiInterface>;
 
 	beforeEach(() => {
 		setActivePinia(createPinia());
 
-		meApi = createMock<serverApi.MeApiInterface>();
+		meApi = createMock<serverMeApi.MeApiInterface>();
 
-		jest.spyOn(serverApi, "MeApiFactory").mockReturnValue(meApi);
+		jest.spyOn(serverMeApi, "MeApiFactory").mockReturnValue(meApi);
 	});
 
 	afterEach(() => {

diff --git a/src/modules/data/env-config/envConfig.store.unit.ts b/src/modules/data/env-config/envConfig.store.unit.ts
@@ -1,19 +1,21 @@
-import * as serverApi from "@/serverApi/v3/api";
+import * as serverDefaultApi from "@/serverApi/v3/api/default-api";
 import { envsFactory } from "@@/tests/test-utils/factory";
 import { mockApiResponse } from "@@/tests/test-utils/mockApiResponse";
 import { createMock, DeepMocked } from "@golevelup/ts-jest";
 import { createPinia, setActivePinia } from "pinia";
 import { useEnvConfigStore } from "./envConfig.store";
 
 describe("EnvConfigStore", () => {
-	let defaultApi: DeepMocked<serverApi.DefaultApiInterface>;
+	let defaultApi: DeepMocked<serverDefaultApi.DefaultApiInterface>;
 
 	beforeEach(() => {
 		setActivePinia(createPinia());
 
-		defaultApi = createMock<serverApi.DefaultApiInterface>();
+		defaultApi = createMock<serverDefaultApi.DefaultApiInterface>();
 
-		jest.spyOn(serverApi, "DefaultApiFactory").mockReturnValue(defaultApi);
+		jest
+			.spyOn(serverDefaultApi, "DefaultApiFactory")
+			.mockReturnValue(defaultApi);
 	});
 
 	afterEach(() => {