From 40014f3028ad344a0308a026b34d9e0b5c7b353a Mon Sep 17 00:00:00 2001
From: Karina Cadette <kcadette@amazon.com>
Date: Thu, 17 Feb 2022 22:06:02 +0000
Subject: [PATCH] Squashed commit of the following
commit bcd5f698
Author: Oleksandr Kosse (EPAM) <oleksandr_kosse@epam.com>
Date: Wed Feb 16 2022 06:56:11 GMT-0600 (Central Standard Time)
Merge branch 'GONRG-4309-cost-optimization-for-service' into 'master'
GONRG-4309: Cost optimization for service
See merge request osdu/platform/system/indexer-service!283
commit f9c536d5
Author: Nastassia Rabeichykava (EPAM) <nastassia_rabeichykava@epam.com>
Date: Wed Feb 16 2022 06:56:11 GMT-0600 (Central Standard Time)
GONRG-4309: Cost optimization for service
---
.gitlab-ci.yml | 2 +-
devops/gcp/deploy/values.yaml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15f4038e1..00baf4db0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ variables:
OSDU_GCP_QUEUE_SA_EMAIL: pub-sub-indexer-queue@nice-etching-277309.iam.gserviceaccount.com
OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.log_level=INFO --set data.schema_host=$OSDU_GCP_SCHEMA_API/schema --set data.google_cloud_project=$OSDU_GCP_PROJECT --set data.redis_search_host=$REDIS_SEARCH_HOST --set data.redis_group_host=$REDIS_GROUP_HOST --set data.indexer_queue_host=$OSDU_GCP_INDEXER_QUEUE_URL --set data.crs_api=$OSDU_GCP_CRS_API --set data.partition_api=$OSDU_GCP_PARTITION_API --set data.google_audiences=$GOOGLE_AUDIENCE --set data.indexer_que_service_mail=$OSDU_GCP_QUEUE_SA_EMAIL"
OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.key_ring=$OSDU_GCP_PARTITION_KEY_RING --set data.log_level=INFO --set data.schema_host=$OSDU_GCP_SCHEMA_API/schema --set data.google_cloud_project=$OSDU_GCP_PROJECT --set data.redis_search_host=$REDIS_SEARCH_HOST --set data.redis_group_host=$REDIS_GROUP_HOST --set data.indexer_queue_host=$OSDU_GCP_INDEXER_QUEUE_URL --set data.crs_api=$OSDU_GCP_CRS_API --set data.partition_api=$OSDU_GCP_PARTITION_API --set data.google_audiences=$GOOGLE_AUDIENCE --set data.indexer_que_service_mail=$OSDU_GCP_QUEUE_SA_EMAIL"
- OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s --set data.limits_cpu=1 --set data.limits_memory=1G"
+ OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
OSDU_GCP_HELM_CONFIG_SERVICE: indexer-config
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: indexer-deploy
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml
index 886588bcd..cb2dc0742 100644
--- a/devops/gcp/deploy/values.yaml
+++ b/devops/gcp/deploy/values.yaml
@@ -3,8 +3,8 @@
# Declare variables to be passed into your templates.
data:
- requests_cpu: "0.25"
- requests_memory: "256M"
+ requests_cpu: "0.1"
+ requests_memory: "640M"
limits_cpu: "1"
limits_memory: "1G"
serviceAccountName: ""
--
GitLab