Adjust OpenShift build resources

CSCfi · May 13, 2024 · 9a29047 · 9a29047
1 parent 4750d63
commit 9a29047
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 6 deletions.
diff --git a/openshift/rahti2/devel/template-devel.yml b/openshift/rahti2/devel/template-devel.yml
@@ -64,10 +64,10 @@ objects:
           name: researchfi-frontend-devel:latest
       resources:
         limits:
-          cpu: 2
+          cpu: 1
           memory: 6Gi
         requests:
-          cpu: 1
+          cpu: 0.5
           memory: 4Gi
       successfulBuildsHistoryLimit: 2
       failedBuildsHistoryLimit: 2

diff --git a/openshift/rahti2/production/template-production.yml b/openshift/rahti2/production/template-production.yml
@@ -89,10 +89,10 @@ objects:
           name: researchfi-frontend-staging:latest
       resources:
         limits:
-          cpu: 2
+          cpu: 1
           memory: 6Gi
         requests:
-          cpu: 1
+          cpu: 0.5
           memory: 4Gi
       successfulBuildsHistoryLimit: 2
       failedBuildsHistoryLimit: 2

diff --git a/openshift/rahti2/qa/template-qa.yml b/openshift/rahti2/qa/template-qa.yml
@@ -63,10 +63,10 @@ objects:
           name: researchfi-frontend-qa:latest
       resources:
         limits:
-          cpu: 2
+          cpu: 1
           memory: 6Gi
         requests:
-          cpu: 1
+          cpu: 0.5
           memory: 4Gi
       successfulBuildsHistoryLimit: 2
       failedBuildsHistoryLimit: 2

diff --git a/src/assets/config/auth_config.json_docker-auth-test b/src/assets/config/auth_config.json_docker-auth-test
@@ -0,0 +1,16 @@
+{
+  "stsServer": "https://tnxwork.eu.ngrok.io/auth_test_keycloak/realms/mydatatest" ,
+  "redirectUrl": "https://localhost:5003/mydata/redirect" ,
+  "postLogoutRedirectUri": "https://localhost:5003/mydata" ,
+  "clientId": "js",
+  "scope": "openid api1",
+  "responseType": "code",
+  "silentRenew": true,
+  "useRefreshToken": true,
+  "postLoginRoute": "mydata/service-deployment?step=3",
+  "ignoreNonceAfterRefresh": true,
+  "historyCleanupOff": false,
+  "customParamsAuthRequest": {
+    "ui_locales": "fi"
+  }
+}
diff --git a/src/assets/config/auth_config.json_keycloak-devel.rahtiapp.fi b/src/assets/config/auth_config.json_keycloak-devel.rahtiapp.fi
@@ -0,0 +1,12 @@
+{
+  "stsServer": "https://keycloak-devel.rahtiapp.fi/auth/realms/mydata" ,
+  "redirectUrl": "https://localhost:5003/mydata/redirect" ,
+  "postLogoutRedirectUri": "https://localhost:5003/mydata" ,
+  "clientId": "js",
+  "scope": "openid api1",
+  "responseType": "code",
+  "silentRenew": true,
+  "useRefreshToken": true,
+  "postLoginRoute": "mydata/service-deployment?step=3",
+  "ignoreNonceAfterRefresh": true
+}
diff --git a/src/assets/config/auth_config.json_keycloak-qa.rahtiapp.fi b/src/assets/config/auth_config.json_keycloak-qa.rahtiapp.fi
@@ -0,0 +1,12 @@
+{
+  "stsServer": "https://keycloak-qa.rahtiapp.fi/realms/mydata" ,
+  "redirectUrl": "https://localhost:5003/mydata/redirect" ,
+  "postLogoutRedirectUri": "https://localhost:5003/mydata" ,
+  "clientId": "js",
+  "scope": "openid api1",
+  "responseType": "code",
+  "silentRenew": true,
+  "useRefreshToken": true,
+  "postLoginRoute": "mydata/service-deployment?step=3",
+  "ignoreNonceAfterRefresh": true
+}
diff --git a/src/assets/config/auth_config.json_keycloak-ts.rahtiapp.fi b/src/assets/config/auth_config.json_keycloak-ts.rahtiapp.fi
@@ -0,0 +1,12 @@
+{
+  "stsServer": "https://keycloak-ts.rahtiapp.fi/realms/mydata_test" ,
+  "redirectUrl": "https://localhost:5003/mydata/redirect" ,
+  "postLogoutRedirectUri": "https://localhost:5003/mydata" ,
+  "clientId": "js",
+  "scope": "openid api1",
+  "responseType": "code",
+  "silentRenew": true,
+  "useRefreshToken": true,
+  "postLoginRoute": "mydata/service-deployment?step=3",
+  "ignoreNonceAfterRefresh": true
+}
diff --git a/src/assets/config/auth_config.json_keycloak19-devel.rahtiapp.fi b/src/assets/config/auth_config.json_keycloak19-devel.rahtiapp.fi
@@ -0,0 +1,16 @@
+{
+  "stsServer": "https://keycloak19-devel.rahtiapp.fi/realms/mydata" ,
+  "redirectUrl": "https://localhost:5003/mydata/redirect" ,
+  "postLogoutRedirectUri": "https://localhost:5003/mydata" ,
+  "clientId": "js",
+  "scope": "openid api1",
+  "responseType": "code",
+  "silentRenew": true,
+  "useRefreshToken": true,
+  "postLoginRoute": "mydata/service-deployment?step=3",
+  "ignoreNonceAfterRefresh": true,
+  "historyCleanupOff": false,
+  "customParamsAuthRequest": {
+    "ui_locales": "fi"
+  }
+}
diff --git a/src/assets/config/auth_config.json_researchfi-auth.rahtiapp.fi b/src/assets/config/auth_config.json_researchfi-auth.rahtiapp.fi
@@ -0,0 +1,12 @@
+{
+  "stsServer": "https://researchfi-auth.rahtiapp.fi/realms/mydata" ,
+  "redirectUrl": "https://localhost:5003/mydata/redirect" ,
+  "postLogoutRedirectUri": "https://localhost:5003/mydata" ,
+  "clientId": "js",
+  "scope": "openid api1",
+  "responseType": "code",
+  "silentRenew": true,
+  "useRefreshToken": true,
+  "postLoginRoute": "mydata/service-deployment?step=3",
+  "ignoreNonceAfterRefresh": true
+}