feat: Add metric-server (#321)

wandb · Jan 15, 2025 · c8b96ca · c8b96ca
1 parent 3f4c044
commit c8b96ca
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/examples/byo-vpc-sql/main.tf b/examples/byo-vpc-sql/main.tf
@@ -195,6 +195,7 @@ module "app_eks" {
   eks_addon_coredns_version        = var.eks_addon_coredns_version
   eks_addon_kube_proxy_version     = var.eks_addon_kube_proxy_version
   eks_addon_vpc_cni_version        = var.eks_addon_vpc_cni_version
+  eks_addon_metrics_server_version = var.eks_addon_metrics_server_version
 }
 
 locals {

diff --git a/examples/byo-vpc-sql/variables.tf b/examples/byo-vpc-sql/variables.tf
@@ -437,6 +437,11 @@ variable "eks_addon_vpc_cni_version" {
   default     = "v1.18.3-eksbuild.3"
 }
 
+variable "eks_addon_metrics_server_version" {
+  description = "The version of the metrics-server addon to install. Check compatibility with `aws eks describe-addon-versions --region $REGION --kubernetes-version $EKS_CLUSTER_VERSION`"
+  type        = string
+  default     = "v0.7.2-eksbuild.1"
+}
 
 ##########################################
 # External Bucket                        #

diff --git a/main.tf b/main.tf
@@ -180,7 +180,7 @@ module "app_eks" {
   eks_addon_coredns_version        = var.eks_addon_coredns_version
   eks_addon_kube_proxy_version     = var.eks_addon_kube_proxy_version
   eks_addon_vpc_cni_version        = var.eks_addon_vpc_cni_version
-
+  eks_addon_metrics_server_version = var.eks_addon_metrics_server_version
 }
 
 

diff --git a/modules/app_eks/add-ons.tf b/modules/app_eks/add-ons.tf
@@ -78,3 +78,13 @@ resource "aws_eks_addon" "vpc_cni" {
   resolve_conflicts        = "OVERWRITE"
   service_account_role_arn = aws_iam_role.oidc.arn
 }
+
+resource "aws_eks_addon" "metrics_server" {
+  depends_on = [
+    module.eks
+  ]
+  cluster_name      = var.namespace
+  addon_name        = "metrics-server"
+  addon_version     = var.eks_addon_metrics_server_version
+  resolve_conflicts = "OVERWRITE"
+}
diff --git a/modules/app_eks/variables.tf b/modules/app_eks/variables.tf
@@ -182,3 +182,8 @@ variable "eks_addon_vpc_cni_version" {
   description = "The version of the VPC CNI addon to install. Check the docs for more information about the compatibility https://docs.aws.amazon.com/eks/latest/userguide/vpc-add-on-update.html."
   type        = string
 }
+
+variable "eks_addon_metrics_server_version" {
+  description = "The version of the metrics-server addon to install. Check compatibility with `aws eks describe-addon-versions --region $REGION --kubernetes-version $EKS_CLUSTER_VERSION`"
+  type        = string
+}
diff --git a/variables.tf b/variables.tf
@@ -431,6 +431,11 @@ variable "eks_addon_vpc_cni_version" {
   default     = "v1.18.3-eksbuild.3"
 }
 
+variable "eks_addon_metrics_server_version" {
+  description = "The version of the metrics-server addon to install. Check compatibility with `aws eks describe-addon-versions --region $REGION --kubernetes-version $EKS_CLUSTER_VERSION`"
+  type        = string
+  default     = "v0.7.2-eksbuild.1"
+}
 
 ##########################################
 # External Bucket                        #