Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #829

Merged
merged 1 commit into from
Feb 20, 2025
Merged

fixes #829

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws/cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

| Name | Source | Version |
|------|--------|---------|
| <a name="module_managed_node_group"></a> [managed\_node\_group](#module\_managed\_node\_group) | github.com/mattermost/mattermost-cloud-monitoring.git//aws/eks-managed-node-groups | v1.8.42 |
| <a name="module_managed_node_group"></a> [managed\_node\_group](#module\_managed\_node\_group) | github.com/mattermost/mattermost-cloud-monitoring.git//aws/eks-managed-node-groups | v1.8.43 |

## Resources

Expand Down
2 changes: 1 addition & 1 deletion aws/cluster/worker_asg.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "managed_node_group" {
source = "github.com/mattermost/mattermost-cloud-monitoring.git//aws/eks-managed-node-groups?ref=v1.8.42"
source = "github.com/mattermost/mattermost-cloud-monitoring.git//aws/eks-managed-node-groups?ref=v1.8.43"
vpc_security_group_ids = [aws_security_group.worker-sg.id]
volume_size = var.node_volume_size
volume_type = var.node_volume_type
Expand Down
93 changes: 0 additions & 93 deletions aws/eks-managed-node-groups/graviton_node_groups.tf
Original file line number Diff line number Diff line change
Expand Up @@ -91,99 +91,6 @@ resource "aws_eks_node_group" "general_arm_nodes_eks_cluster_ng" {
}
}

resource "aws_launch_template" "cluster_nodes_eks_arm_launch_template" {
name = "${var.cluster_short_name}_cluster_arm_launch_template"
description = "${var.cluster_short_name} cluster arm nodes launch template"

vpc_security_group_ids = var.vpc_security_group_ids

block_device_mappings {
device_name = "/dev/xvda"

ebs {
volume_size = var.volume_size
volume_type = var.volume_type
}
}

# Support for AL2 and AL2023 images dynamically
image_id = var.use_al2023 ? var.al2023_arm_image_id : var.arm_image_id
instance_type = var.arm_instance_type
ebs_optimized = var.ebs_optimized

user_data = var.use_al2023 ? base64encode(<<USERDATA
#!/bin/bash
echo "export AWS_REGION=${data.aws_region.current.name}" >> /etc/environment
source /etc/environment
cat <<EOF > /etc/eks/nodeadm-config.yaml
apiVersion: node.eks.aws/v1alpha1
kind: NodeConfig
spec:
cluster:
name: ${var.cluster_name}
apiServerEndpoint: |
${var.api_server_endpoint}
certificateAuthority: |
${var.certificate_authority}
cidr: ${var.service_ipv4_cidr}
EOF

/usr/local/bin/nodeadm init -c file:///etc/eks/nodeadm-config.yaml
USERDATA
) : base64encode(<<USERDATA
#!/bin/bash
/etc/eks/bootstrap.sh --apiserver-endpoint '${var.api_server_endpoint}' --b64-cluster-ca '${var.certificate_authority}' '${var.cluster_name}' --kubelet-extra-args "--kube-reserved cpu=250m,memory=1Gi,ephemeral-storage=1Gi --system-reserved cpu=250m,memory=0.2Gi,ephemeral-storage=1Gi --eviction-hard memory.available<0.2Gi,nodefs.available<10%"
USERDATA
)

tag_specifications {
resource_type = "instance"

tags = {
Name = "${var.cluster_short_name}-arm-cluster-nodes"
KubernetesCluster = var.cluster_name
VpcID = var.vpc_id
}
}
}

resource "aws_eks_node_group" "general_arm_nodes_eks_cluster_ng" {
cluster_name = var.cluster_name
node_group_name = "${var.node_group_name}-arm-nodes"

node_role_arn = var.node_role_arn

subnet_ids = var.subnet_ids

tags = {
"Name" : "${var.deployment_name}-worker",
"kubernetes.io/cluster/${var.deployment_name}" : "owned",
"k8s.io/cluster-autoscaler/enabled" : "on",
"k8s.io/cluster-autoscaler/${var.deployment_name}" : "on"
KubernetesCluster : var.cluster_name

}

labels = {
Name = "${var.node_group_name}_arm_nodes"
}

scaling_config {
desired_size = var.arm_desired_size
max_size = var.arm_max_size
min_size = var.arm_min_size
}

launch_template {
name = aws_launch_template.cluster_nodes_eks_arm_launch_template.name
version = aws_launch_template.cluster_nodes_eks_arm_launch_template.latest_version
}

lifecycle {
create_before_destroy = true
}
}

resource "aws_eks_node_group" "calico_arm_nodes" {
count = var.is_calico_enabled ? 1 : 0
cluster_name = var.cluster_name
Expand Down