From ac31c521f934bce532d244a409f549f40fbaa884 Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Thu, 5 Dec 2024 13:13:27 -0500 Subject: [PATCH] Remove unused pools --- .../resources/config/prod/pool_schema.yml | 9 ---- .../prod/resource-config/cwb_ws_prod_v7.yml | 32 --------------- .../prod/resource-config/vpc_sc_v10.yml | 40 ------------------ .../prod/resource-config/vpc_sc_v11.yml | 41 ------------------- 4 files changed, 122 deletions(-) delete mode 100644 src/main/resources/config/prod/resource-config/cwb_ws_prod_v7.yml delete mode 100644 src/main/resources/config/prod/resource-config/vpc_sc_v10.yml delete mode 100644 src/main/resources/config/prod/resource-config/vpc_sc_v11.yml diff --git a/src/main/resources/config/prod/pool_schema.yml b/src/main/resources/config/prod/pool_schema.yml index 23e54ae5..90357061 100644 --- a/src/main/resources/config/prod/pool_schema.yml +++ b/src/main/resources/config/prod/pool_schema.yml @@ -1,21 +1,12 @@ # Resource Buffer Service Pools Schema in prod environment --- poolConfigs: - - poolId: "cwb_ws_prod_v7" - size: 3000 - resourceConfigName: "cwb_ws_prod_v7" - poolId: "cwb_ws_prod_v8" size: 3000 resourceConfigName: "cwb_ws_prod_v8" - poolId: "datarepo_v1" size: 1000 resourceConfigName: "datarepo_v1" - - poolId: "vpc_sc_v10" - size: 1000 - resourceConfigName: "vpc_sc_v10" - - poolId: "vpc_sc_v11" - size: 1000 - resourceConfigName: "vpc_sc_v11" - poolId: "vpc_sc_v12" size: 1000 resourceConfigName: "vpc_sc_v12" diff --git a/src/main/resources/config/prod/resource-config/cwb_ws_prod_v7.yml b/src/main/resources/config/prod/resource-config/cwb_ws_prod_v7.yml deleted file mode 100644 index 6fe5bf24..00000000 --- a/src/main/resources/config/prod/resource-config/cwb_ws_prod_v7.yml +++ /dev/null @@ -1,32 +0,0 @@ -# Community Workbench buffered workspace template ---- -configName: "cwb_ws_prod_v7" -gcpProjectConfig: - projectIdSchema: - prefix: "terra" - scheme: "RANDOM_CHAR" - # firecloud.org/prod/CommunityWorkbench - parentFolderId: "710468670182" - billingAccount: "0106B0-41CAA9-427C96" - enabledApis: - - "bigquery-json.googleapis.com" - - "compute.googleapis.com" - - "container.googleapis.com" - - "containerregistry.googleapis.com" - - "cloudbilling.googleapis.com" - - "clouderrorreporting.googleapis.com" - - "cloudkms.googleapis.com" - - "cloudtrace.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/prod/resource-config/vpc_sc_v10.yml b/src/main/resources/config/prod/resource-config/vpc_sc_v10.yml deleted file mode 100644 index 24a9091d..00000000 --- a/src/main/resources/config/prod/resource-config/vpc_sc_v10.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Projects with VPC-SC configuration ---- -configName: "vpc_sc_v10" -gcpProjectConfig: - projectIdSchema: - prefix: "terra-vpc-sc" - scheme: "RANDOM_CHAR" - # firecloud.org/prod/for_vpc_sc_unclaimed - parentFolderId: "160283235721" - billingAccount: "0106B0-41CAA9-427C96" - 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" - - "serviceusage.googleapis.com" - - "storage-api.googleapis.com" - - "storage-component.googleapis.com" - network: - enableNetworkMonitoring: "true" - enablePrivateGoogleAccess: "true" - enableCloudRegistryPrivateGoogleAccess: "true" - blockBatchInternetAccess: "true" - kubernetesEngine: - createGkeDefaultServiceAccount: "true" - serviceUsage: - bigQuery: - overrideBigQueryDailyUsageQuota: true - bigQueryDailyUsageQuotaOverrideValueMebibytes: 38146972 # 40 TB - securityGroup: "high" diff --git a/src/main/resources/config/prod/resource-config/vpc_sc_v11.yml b/src/main/resources/config/prod/resource-config/vpc_sc_v11.yml deleted file mode 100644 index 8737b299..00000000 --- a/src/main/resources/config/prod/resource-config/vpc_sc_v11.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Projects with VPC-SC configuration ---- -configName: "vpc_sc_v11" -gcpProjectConfig: - projectIdSchema: - prefix: "terra-vpc-sc" - scheme: "RANDOM_CHAR" - # firecloud.org/prod/for_vpc_sc_unclaimed - parentFolderId: "160283235721" - billingAccount: "0106B0-41CAA9-427C96" - 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" - - "serviceusage.googleapis.com" - - "storage-api.googleapis.com" - - "storage-component.googleapis.com" - network: - enableNetworkMonitoring: "true" - enablePrivateGoogleAccess: "true" - enableCloudRegistryPrivateGoogleAccess: "true" - enableArtifactRegistryPrivateGoogleAccess: "true" - blockBatchInternetAccess: "true" - kubernetesEngine: - createGkeDefaultServiceAccount: "true" - serviceUsage: - bigQuery: - overrideBigQueryDailyUsageQuota: true - bigQueryDailyUsageQuotaOverrideValueMebibytes: 38146972 # 40 TB - securityGroup: "high"