Skip to content

Commit fa096fb

Browse files
Lingling PengLingling Peng
authored andcommitted
move patch to main.tf
1 parent e666c15 commit fa096fb

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

modules/sage-aws-k8s-node-autoscaler/data.tf

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,4 @@ data "aws_secretsmanager_secret" "spotinst_token" {
1212

1313
data "aws_secretsmanager_secret_version" "secret_credentials" {
1414
secret_id = data.aws_secretsmanager_secret.spotinst_token.id
15-
}
16-
17-
# patch
18-
# Discover the cluster version (or let a var override it)
19-
data "aws_eks_cluster" "this" {
20-
name = var.cluster_name
21-
}
22-
23-
locals {
24-
k8s_version = coalesce(var.cluster_version, data.aws_eks_cluster.this.version) # e.g., "1.29"
25-
}
26-
27-
# Amazon Linux 2 EKS-optimized AMI via SSM (non-GPU)
28-
data "aws_ssm_parameter" "eks_worker_ami" {
29-
name = "/aws/service/eks/optimized-ami/${local.k8s_version}/amazon-linux-2/recommended/image_id"
3015
}

modules/sage-aws-k8s-node-autoscaler/main.tf

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,23 @@ resource "helm_release" "ocean-kubernetes-controller" {
104104
}
105105

106106

107+
# -----------patch-------------------------
108+
# --- Discover the current cluster version ---
109+
data "aws_eks_cluster" "this" {
110+
name = var.cluster_name
111+
}
112+
113+
locals {
114+
# Use var.cluster_version if set, else detect from live cluster
115+
k8s_version = coalesce(var.cluster_version, data.aws_eks_cluster.this.version)
116+
}
117+
118+
# --- Lookup recommended AL2 AMI from SSM ---
119+
data "aws_ssm_parameter" "eks_worker_ami" {
120+
name = "/aws/service/eks/optimized-ami/${local.k8s_version}/amazon-linux-2/recommended/image_id"
121+
}
122+
# -----------patch-------------------------
123+
107124
module "ocean-aws-k8s" {
108125
source = "spotinst/ocean-aws-k8s/spotinst"
109126
version = "1.4.0"

0 commit comments

Comments
 (0)