Merge pull request #1434 from atlassian/opensearch-config-for-bb

Added opensearch config to .tfvars for Bitbucker
atlassian · Jun 7, 2024 · 76729a0 · 76729a0
2 parents 8fa816d + a9951d6
commit 76729a0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars
@@ -237,7 +237,7 @@ confluence_collaborative_editing_enabled = true
 ################################################################################
 
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
-bitbucket_version_tag = "8.19.0"
+bitbucket_version_tag = "8.19.3"
 
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
 bitbucket_dataset_size = "small"
@@ -292,13 +292,14 @@ bitbucket_nfs_requests_memory = "4Gi"
 bitbucket_nfs_limits_cpu      = "1.5"
 bitbucket_nfs_limits_memory   = "6Gi"
 
-# Elasticsearch resource configuration for Bitbucket
-bitbucket_elasticsearch_requests_cpu    = "1"
-bitbucket_elasticsearch_requests_memory = "4Gi"
-bitbucket_elasticsearch_limits_cpu      = "1.5"
-bitbucket_elasticsearch_limits_memory   = "6Gi"
-bitbucket_elasticsearch_storage         = "100"
-bitbucket_elasticsearch_replicas        = "2"
+# Opensearch resource configuration for Bitbucket
+bitbucket_opensearch_requests_cpu = "1"
+bitbucket_opensearch_requests_memory = "4Gi"
+bitbucket_opensearch_limits_cpu = "1.5"
+bitbucket_opensearch_limits_memory = "6Gi"
+bitbucket_opensearch_storage = "100"
+bitbucket_opensearch_replicas = "2"
+
 
 # RDS instance configurable attributes. Note that the allowed value of allocated storage and iops may vary based on instance type.
 # You may want to adjust these values according to your needs.

diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars
@@ -246,7 +246,7 @@ confluence_collaborative_editing_enabled = true
 ################################################################################
 
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
-bitbucket_version_tag = "8.19.0"
+bitbucket_version_tag = "8.19.3"
 
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
 bitbucket_dataset_size = "large"
@@ -293,13 +293,14 @@ bitbucket_nfs_requests_memory = "8Gi"
 bitbucket_nfs_limits_cpu      = "3"
 bitbucket_nfs_limits_memory   = "10Gi"
 
-# Elasticsearch resource configuration for Bitbucket
-bitbucket_elasticsearch_requests_cpu    = "1.5"
-bitbucket_elasticsearch_requests_memory = "4Gi"
-bitbucket_elasticsearch_limits_cpu      = "2"
-bitbucket_elasticsearch_limits_memory   = "5Gi"
-bitbucket_elasticsearch_storage         = "1000"
-bitbucket_elasticsearch_replicas        = "2"
+# Opensearch resource configuration for Bitbucket
+bitbucket_opensearch_requests_cpu = "1.5"
+bitbucket_opensearch_requests_memory = "4Gi"
+bitbucket_opensearch_limits_cpu = "2"
+bitbucket_opensearch_limits_memory = "5Gi"
+bitbucket_opensearch_storage = "1000"
+bitbucket_opensearch_replicas = "2"
+
 
 # RDS instance configurable attributes. Note that the allowed value of allocated storage and iops may vary based on instance type.
 # You may want to adjust these values according to your needs.