From dedad807b2dbdea07b18b580943f01526dc58cb5 Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Fri, 8 Nov 2024 11:36:57 -0500 Subject: [PATCH 1/3] Remove unused pool type --- .../resources/config/tools/pool_schema.yml | 6 ---- .../cwb_ws_resource_fiab_v7.yml | 32 ------------------ .../cwb_ws_resource_fiab_v8.yml | 33 ------------------- 3 files changed, 71 deletions(-) delete mode 100644 src/main/resources/config/tools/resource-config/cwb_ws_resource_fiab_v7.yml delete mode 100644 src/main/resources/config/tools/resource-config/cwb_ws_resource_fiab_v8.yml diff --git a/src/main/resources/config/tools/pool_schema.yml b/src/main/resources/config/tools/pool_schema.yml index 1e4507e8..8e00e21e 100644 --- a/src/main/resources/config/tools/pool_schema.yml +++ b/src/main/resources/config/tools/pool_schema.yml @@ -2,12 +2,6 @@ # READY resource ratio by pool over time: https://grafana.dsp-devops.broadinstitute.org/goto/qHOGMufSk?orgId=1 --- poolConfigs: - - poolId: "cwb_ws_fiab_v7" - size: 500 - resourceConfigName: "cwb_ws_resource_fiab_v7" - - poolId: "cwb_ws_fiab_v8" - size: 500 - resourceConfigName: "cwb_ws_resource_fiab_v8" - poolId: "cwb_ws_quality_v11" size: 1000 resourceConfigName: "cwb_ws_resource_quality_v11" diff --git a/src/main/resources/config/tools/resource-config/cwb_ws_resource_fiab_v7.yml b/src/main/resources/config/tools/resource-config/cwb_ws_resource_fiab_v7.yml deleted file mode 100644 index c4dcd6bc..00000000 --- a/src/main/resources/config/tools/resource-config/cwb_ws_resource_fiab_v7.yml +++ /dev/null @@ -1,32 +0,0 @@ -# Community Workbench buffered workspace template ---- -configName: "cwb_ws_resource_fiab_v7" -gcpProjectConfig: - projectIdSchema: - prefix: "terra-test" - scheme: "RANDOM_CHAR" - # test.firecloud.org/tools/CommunityWorkbench - parentFolderId: "595081786611" - billingAccount: "01A82E-CA8A14-367457" - enabledApis: - - "bigquery-json.googleapis.com" - - "compute.googleapis.com" - - "container.googleapis.com" - - "cloudbilling.googleapis.com" - - "clouderrorreporting.googleapis.com" - - "cloudkms.googleapis.com" - - "cloudtrace.googleapis.com" - - "containerregistry.googleapis.com" - - "dataflow.googleapis.com" - - "dataproc.googleapis.com" - - "dns.googleapis.com" - - "lifesciences.googleapis.com" - - "logging.googleapis.com" - - "monitoring.googleapis.com" - - "storage-api.googleapis.com" - - "storage-component.googleapis.com" - network: - enableNetworkMonitoring: "false" - enablePrivateGoogleAccess: "true" - kubernetesEngine: - createGkeDefaultServiceAccount: "true" diff --git a/src/main/resources/config/tools/resource-config/cwb_ws_resource_fiab_v8.yml b/src/main/resources/config/tools/resource-config/cwb_ws_resource_fiab_v8.yml deleted file mode 100644 index aa1ab46c..00000000 --- a/src/main/resources/config/tools/resource-config/cwb_ws_resource_fiab_v8.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Community Workbench buffered workspace template ---- -configName: "cwb_ws_resource_fiab_v8" -gcpProjectConfig: - projectIdSchema: - prefix: "terra-test" - scheme: "RANDOM_CHAR" - # test.firecloud.org/tools/CommunityWorkbench - parentFolderId: "595081786611" - billingAccount: "01A82E-CA8A14-367457" - enabledApis: - - "bigquery-json.googleapis.com" - - "batch.googleapis.com" - - "compute.googleapis.com" - - "container.googleapis.com" - - "cloudbilling.googleapis.com" - - "clouderrorreporting.googleapis.com" - - "cloudkms.googleapis.com" - - "cloudtrace.googleapis.com" - - "containerregistry.googleapis.com" - - "dataflow.googleapis.com" - - "dataproc.googleapis.com" - - "dns.googleapis.com" - - "lifesciences.googleapis.com" - - "logging.googleapis.com" - - "monitoring.googleapis.com" - - "storage-api.googleapis.com" - - "storage-component.googleapis.com" - network: - enableNetworkMonitoring: "false" - enablePrivateGoogleAccess: "true" - kubernetesEngine: - createGkeDefaultServiceAccount: "true" From 66e0ef495e9906c3cd460df1f528b6a21b98052b Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Fri, 8 Nov 2024 11:37:13 -0500 Subject: [PATCH 2/3] Remove old version of toolsalpha pool --- .../config/toolsalpha/pool_schema.yml | 3 -- .../resource_toolsalpha_v8.yml | 40 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 src/main/resources/config/toolsalpha/resource-config/resource_toolsalpha_v8.yml diff --git a/src/main/resources/config/toolsalpha/pool_schema.yml b/src/main/resources/config/toolsalpha/pool_schema.yml index aeffcd3a..fad287e4 100644 --- a/src/main/resources/config/toolsalpha/pool_schema.yml +++ b/src/main/resources/config/toolsalpha/pool_schema.yml @@ -1,9 +1,6 @@ # RBS Pools Schema for local testing and on personal environment --- poolConfigs: - - poolId: "resource_toolsalpha_v8" - size: 5 - resourceConfigName: "resource_toolsalpha_v8" - poolId: "resource_toolsalpha_v9" size: 5 resourceConfigName: "resource_toolsalpha_v9" \ No newline at end of file diff --git a/src/main/resources/config/toolsalpha/resource-config/resource_toolsalpha_v8.yml b/src/main/resources/config/toolsalpha/resource-config/resource_toolsalpha_v8.yml deleted file mode 100644 index fd4490c2..00000000 --- a/src/main/resources/config/toolsalpha/resource-config/resource_toolsalpha_v8.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Resource template for local testing and personal environment on GKE ---- -configName: "resource_toolsalpha_v8" -gcpProjectConfig: - projectIdSchema: - prefix: "terra-toolsalpha" - scheme: "RANDOM_CHAR" - # RBS Testing - parentFolderId: "637867149294" - billingAccount: "01A82E-CA8A14-367457" - enabledApis: - - "bigquery-json.googleapis.com" - - "compute.googleapis.com" - - "container.googleapis.com" - - "cloudbilling.googleapis.com" - - "clouderrorreporting.googleapis.com" - - "cloudkms.googleapis.com" - - "cloudtrace.googleapis.com" - - "containerregistry.googleapis.com" - - "dataflow.googleapis.com" - - "dataproc.googleapis.com" - - "dns.googleapis.com" - - "lifesciences.googleapis.com" - - "logging.googleapis.com" - - "monitoring.googleapis.com" - - "storage-api.googleapis.com" - - "storage-component.googleapis.com" - network: - enableNetworkMonitoring: "true" - enablePrivateGoogleAccess: "true" - enableCloudRegistryPrivateGoogleAccess: "true" - blockBatchInternetAccess: "true" - kubernetesEngine: - createGkeDefaultServiceAccount: "true" - iamBindings: - - members: ["group:terra-rbs-test@broadinstitute.org"] - role: "roles/editor" - - members: ["group:terra-rbs-viewer-test@broadinstitute.org"] - role: "roles/viewer" - securityGroup: "high" From d061a99dbb2fd18390f4dc3356842028ba8ebe91 Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Fri, 8 Nov 2024 11:38:27 -0500 Subject: [PATCH 3/3] Whitespace --- src/main/resources/config/toolsalpha/pool_schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config/toolsalpha/pool_schema.yml b/src/main/resources/config/toolsalpha/pool_schema.yml index fad287e4..8d86f222 100644 --- a/src/main/resources/config/toolsalpha/pool_schema.yml +++ b/src/main/resources/config/toolsalpha/pool_schema.yml @@ -3,4 +3,4 @@ poolConfigs: - poolId: "resource_toolsalpha_v9" size: 5 - resourceConfigName: "resource_toolsalpha_v9" \ No newline at end of file + resourceConfigName: "resource_toolsalpha_v9"