diff --git a/CHANGELOG.md b/CHANGELOG.md index 527dc1a..e09b313 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [6.14.1] - 2022-07-19 +### Fixed +- Fix k8s metastore cpu limits. + ## [6.14.0] - 2022-07-18 ### Added - Add support for enabling RDS Performance Insights and Enhanced Monitoring. Both will apply to both reader and writer RDS instances. diff --git a/common.tf b/common.tf index 15ce055..63e22d7 100644 --- a/common.tf +++ b/common.tf @@ -51,6 +51,12 @@ locals { hms_rw_minthreads = max(25, ceil((var.hms_rw_heapsize * 12.5) / 100)) hms_rw_maxthreads = max(100, ceil((var.hms_rw_heapsize * 50) / 100)) + k8s_ro_cpu = var.hms_ro_cpu / 1024 + k8s_ro_cpu_limit = (var.hms_ro_cpu / 1024) * 1.25 + + k8s_rw_cpu = var.hms_rw_cpu / 1024 + k8s_rw_cpu_limit = (var.hms_rw_cpu / 1024) * 1.25 + hms_alias = var.instance_name == "" ? "hms" : "hms-${var.instance_name}" ro_ingress_cidr = var.ingress_cidr diff --git a/k8s-readonly.tf b/k8s-readonly.tf index 2cc2e69..41ec354 100644 --- a/k8s-readonly.tf +++ b/k8s-readonly.tf @@ -204,9 +204,11 @@ resource "kubernetes_deployment" "apiary_hms_readonly" { resources { limits { + cpu = local.k8s_ro_cpu_limit memory = "${var.hms_ro_heapsize}Mi" } requests { + cpu = local.k8s_ro_cpu memory = "${var.hms_ro_heapsize}Mi" } } diff --git a/k8s-readwrite.tf b/k8s-readwrite.tf index 03859e5..0701c81 100644 --- a/k8s-readwrite.tf +++ b/k8s-readwrite.tf @@ -244,9 +244,11 @@ resource "kubernetes_deployment" "apiary_hms_readwrite" { resources { limits { + cpu = local.k8s_rw_cpu_limit memory = "${var.hms_rw_heapsize}Mi" } requests { + cpu = local.k8s_rw_cpu memory = "${var.hms_rw_heapsize}Mi" } }