diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffef849038b962be2e59b4f0e6691ec870045382..bb9ad6827e90d1846beafc1505efdb98f38cf508 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ variables: OSDU_GCP_VENDOR: gcp OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.project_id=$OSDU_GCP_PROJECT --set data.authorize_api=$OSDU_GCP_AUTHORIZE_API --set data.google_audiences=$GOOGLE_AUDIENCE --set data.partition_api=$OSDU_GCP_PARTITION_API --set data.log_level=INFO --set enable_full_bucket_name=$ENABLE_FULL_BUCKET_NAME" OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.project_id=$OSDU_GCP_PROJECT --set data.authorize_api=$OSDU_GCP_AUTHORIZE_API --set data.google_audiences=$GOOGLE_AUDIENCE --set data.partition_api=$OSDU_GCP_PARTITION_API --set data.log_level=INFO --set enable_full_bucket_name=$ENABLE_FULL_BUCKET_NAME" - 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.5 --set data.limits_memory=512M" + 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: legal-config OSDU_GCP_HELM_DEPLOYMENT_SERVICE: legal-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 ea92abad106e55808be531028272c1ba215e0e82..c28b13ab962c871eaf98b2af02e7da7f7d70f57a 100644 --- a/devops/gcp/deploy/values.yaml +++ b/devops/gcp/deploy/values.yaml @@ -3,9 +3,9 @@ # Declare variables to be passed into your templates. data: - requests_cpu: "0.25" - requests_memory: "256M" - limits_cpu: "1.5" + requests_cpu: "0.1" + requests_memory: "384M" + limits_cpu: "1" limits_memory: "1G" serviceAccountName: "" imagePullPolicy: "IfNotPresent"