@@ -120,10 +120,10 @@ resource "aws_launch_template" "init" {
120120 content {
121121 device_name = " /dev/xvda"
122122 ebs {
123- encrypted = " true"
124- kms_key_id = var. ebs_kms_key_arn
125- volume_size = var. ebs_volume_size
126- volume_type = var. ebs_volume_type
123+ encrypted = " true"
124+ kms_key_id = var. ebs_kms_key_arn
125+ volume_size = var. ebs_volume_size
126+ volume_type = var. ebs_volume_type
127127 }
128128 }
129129 }
@@ -273,7 +273,7 @@ ${local.eks_bootstrap}
273273
274274USERDATA
275275 )
276- image_id = local. k8s_node_groups . search . ami_id
276+ image_id = local. k8s_node_groups . search . ami_id
277277 vpc_security_group_ids = local. node_security_group_ids
278278
279279 metadata_options {
@@ -435,54 +435,6 @@ resource "aws_eks_node_group" "tiered" {
435435 depends_on = [aws_eks_addon . vpc-cni , time_sleep . wait_init ]
436436}
437437
438- # aws_eks_node_group.tiered: conditionally created when tiered is in node_quotas with max > 0
439- resource "aws_eks_node_group" "tiered" {
440- count = var. enable_tiered ? 1 : 0
441- ami_type = lookup (local. ami_types , " tiered" , " AL2023_x86_64_STANDARD" )
442- capacity_type = var. k8s_node_groups [" tiered" ]. capacity_type
443- cluster_name = local. eks_cluster_name
444-
445- instance_types = [
446- var . k8s_node_groups [" tiered" ]. instance_types ,
447- ]
448- labels = {
449- " zilliz-group-name" = " tiered"
450- " node-role/tiered" = " true"
451- " node-role/milvus" = " true"
452- }
453- node_group_name_prefix = " ${ local . prefix_name } -tiered-"
454- node_role_arn = local. eks_node_role_arn
455- subnet_ids = local. subnet_ids
456- tags = merge ({
457- " Vendor" = " zilliz-byoc"
458- }, var. custom_tags )
459- tags_all = merge ({
460- " Vendor" = " zilliz-byoc"
461- }, var. custom_tags )
462-
463- launch_template {
464- id = aws_launch_template. diskann . id
465- version = aws_launch_template. diskann . latest_version
466- }
467-
468- scaling_config {
469- desired_size = var. k8s_node_groups [" tiered" ]. min_size
470- max_size = var. k8s_node_groups [" tiered" ]. max_size
471- min_size = var. k8s_node_groups [" tiered" ]. min_size
472- }
473-
474- update_config {
475- max_unavailable_percentage = 33
476- }
477-
478- lifecycle {
479- ignore_changes = [scaling_config [0 ]. desired_size ]
480-
481- }
482-
483- depends_on = [aws_eks_addon . vpc-cni , time_sleep . wait_init ]
484- }
485-
486438# aws_eks_node_group.core:
487439resource "aws_eks_node_group" "core" {
488440 ami_type = local. ami_types . core
0 commit comments