Skip to content

[CORE-331] Reduce project pool sizes and remove references to alpha and perf environments #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions buffer-clienttests/src/main/resources/servers/perf.json

This file was deleted.

This file was deleted.

8 changes: 1 addition & 7 deletions buffer-clienttests/tools/render-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,7 @@ VAULT_TOKEN=${2:-$(cat $HOME/.vault-token)}
DSDE_TOOLBOX_DOCKER_IMAGE=broadinstitute/dsde-toolbox:consul-0.20.0
VAULT_CLIENT_SERVICE_ACCOUNT_PATH=secret/dsde/terra/kernel/integration/${ENV}/buffer/client-sa
CLIENT_SERVICE_ACCOUNT_OUTPUT_FILE_PATH="$(dirname $0)"/../rendered/${ENV}-buffer-client-sa-key.json
# We uses different Vault for personal envs and perf/dev environments. We need a better solution once we start using
# preview environment for test.
if [ "$ENV" = "perf" ]; then
VAULT_CLIENT_SERVICE_ACCOUNT_PATH=secret/dsde/terra/kernel/${ENV}/${ENV}/buffer/client-sa
else
VAULT_CLIENT_SERVICE_ACCOUNT_PATH=secret/dsde/terra/kernel/integration/${ENV}/buffer/client-sa
fi
VAULT_CLIENT_SERVICE_ACCOUNT_PATH=secret/dsde/terra/kernel/integration/${ENV}/buffer/client-sa

mkdir -p ../rendered
docker run --rm -e VAULT_TOKEN=$VAULT_TOKEN ${DSDE_TOOLBOX_DOCKER_IMAGE} \
Expand Down
12 changes: 0 additions & 12 deletions src/main/resources/config/alpha/pool_schema.yml

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions src/main/resources/config/alpha/resource-config/datarepo_v1.yml

This file was deleted.

34 changes: 0 additions & 34 deletions src/main/resources/config/alpha/resource-config/vpc_sc_v6.yml

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/config/buffertest/pool_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
---
poolConfigs:
- poolId: "resource_buffer_test_v3"
size: 1500
size: 0
resourceConfigName: "resource_buffer_test_v3"
8 changes: 4 additions & 4 deletions src/main/resources/config/dev/pool_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
---
poolConfigs:
- poolId: "cwb_ws_dev_v8"
size: 300
size: 100
resourceConfigName: "cwb_ws_resource_dev_v8"
- poolId: "datarepo_fakeprod_v1"
size: 50
resourceConfigName: "datarepo_fakeprod_v1"
- poolId: "datarepo_v3"
size: 300
size: 100
resourceConfigName: "datarepo_v3"
- poolId: "vpc_sc_v13"
size: 300
size: 100
resourceConfigName: "vpc_sc_v13"
- poolId: "workspace_manager_v12"
size: 500
size: 50
resourceConfigName: "workspace_manager_v12"
15 changes: 0 additions & 15 deletions src/main/resources/config/perf/pool_schema.yml

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions src/main/resources/config/perf/resource-config/datarepo_v1.yml

This file was deleted.

40 changes: 0 additions & 40 deletions src/main/resources/config/perf/resource-config/vpc_sc_v9.yml

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/config/prod/pool_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
---
poolConfigs:
- poolId: "cwb_ws_prod_v8"
size: 3000
size: 1000
resourceConfigName: "cwb_ws_prod_v8"
- poolId: "datarepo_v1"
size: 1000
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/staging/pool_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ poolConfigs:
size: 100
resourceConfigName: "cwb_ws_resource_staging_v8"
- poolId: "datarepo_v1"
size: 300
size: 100
resourceConfigName: "datarepo_v1"
- poolId: "vpc_sc_v7"
size: 100
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/config/tools/pool_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
---
poolConfigs:
- poolId: "cwb_ws_quality_v11"
size: 1000
size: 200
resourceConfigName: "cwb_ws_resource_quality_v11"
- poolId: "datarepo_v1"
size: 1000
Expand All @@ -12,5 +12,5 @@ poolConfigs:
size: 100
resourceConfigName: "vpc_sc_qa-fiab_v6"
- poolId: "workspace_manager_v12"
size: 500
size: 100
resourceConfigName: "workspace_manager_v12"
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class PoolSchemaTest {
/** List of pool config folders for all environments, e.g. prod, staging, dev. */
private static final List<String> POOL_CONFIG_FOLDERS =
ImmutableList.of(
"alpha/", "buffertest/", "dev/", "prod/", "perf/", "staging/", "tools/");
"buffertest/", "dev/", "prod/", "staging/", "tools/");

@Test
public void testConfigValid() {
Expand Down