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.

Sign up for GitHub

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

♻️ Refactor Airflow MNG and LT names #4460

Merged
merged 2 commits into from
Jun 4, 2024
Merged

♻️ Refactor Airflow MNG and LT names #4460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a56340
Refactor MNG and LT
Jun 4, 2024
ef5c038
Fix docs
Jun 4, 2024
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 source/documentation/diagrams/architecture-diagrams.html.md.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ If you would like to edit Excalidraw files, then use one of the following method

> Recommended for creating diagrams.

- Using the web version of [Excalidraw](https://excalidraw.com/) and opening the the cloned, or downloaded [files](https://github.com/ministryofjustice/analytical-platform/tree/main/docs/source/documentation/diagrams)
- Using the web version of [Excalidraw](https://excalidraw.com/) and opening the the cloned, or downloaded [files](https://github.com/ministryofjustice/analytical-platform/tree/main/source/documentation/diagrams)

> Recommended for small group sessions using [live collaboration](https://blog.excalidraw.com/building-excalidraw-p2p-collaboration-feature/)
16 changes: 8 additions & 8 deletions terraform/aws/analytical-platform-data-production/airflow/eks.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ output "kubeconfig_certificate_authority_data" {
value = aws_eks_cluster.airflow_dev_eks_cluster.certificate_authority[0].data
}

resource "aws_eks_node_group" "new_dev_node_group_standard" {
resource "aws_eks_node_group" "dev_node_group_standard" {
cluster_name = aws_eks_cluster.airflow_dev_eks_cluster.name
node_group_name = "standard"
node_role_arn = aws_iam_role.airflow_dev_node_instance_role.arn
Expand All @@ -108,7 +108,7 @@ resource "aws_eks_node_group" "new_dev_node_group_standard" {
}
}

resource "aws_eks_node_group" "new_dev_node_group_high_memory" {
resource "aws_eks_node_group" "dev_node_group_high_memory" {
cluster_name = aws_eks_cluster.airflow_dev_eks_cluster.name
node_group_name = "high-memory"
node_role_arn = aws_iam_role.airflow_dev_node_instance_role.arn
Expand Down Expand Up @@ -271,15 +271,15 @@ output "prod_kubeconfig_certificate_authority_data" {
value = aws_eks_cluster.airflow_prod_eks_cluster.certificate_authority[0].data
}

resource "aws_eks_node_group" "new_prod_node_group_standard" {
resource "aws_eks_node_group" "prod_node_group_standard" {
cluster_name = aws_eks_cluster.airflow_prod_eks_cluster.name
node_group_name = "new-standard"
node_role_arn = aws_iam_role.airflow_prod_node_instance_role.arn
subnet_ids = aws_subnet.prod_private_subnet[*].id

launch_template {
id = aws_launch_template.new_prod_standard.id
version = aws_launch_template.new_prod_standard.latest_version
id = aws_launch_template.prod_standard.id
version = aws_launch_template.prod_standard.latest_version
}

scaling_config {
Expand All @@ -297,15 +297,15 @@ resource "aws_eks_node_group" "new_prod_node_group_standard" {
}
}

resource "aws_eks_node_group" "new_prod_node_group_high_memory" {
resource "aws_eks_node_group" "prod_node_group_high_memory" {
cluster_name = aws_eks_cluster.airflow_prod_eks_cluster.name
node_group_name = "new-high-memory"
node_role_arn = aws_iam_role.airflow_prod_node_instance_role.arn
subnet_ids = aws_subnet.prod_private_subnet[*].id

launch_template {
id = aws_launch_template.new_prod_high_memory.id
version = aws_launch_template.new_prod_high_memory.latest_version
id = aws_launch_template.prod_high_memory.id
version = aws_launch_template.prod_high_memory.latest_version
}

scaling_config {
Expand Down
4 changes: 2 additions & 2 deletions terraform/aws/analytical-platform-data-production/airflow/launch-templates.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ import {
id = "lt-0ba6601ac92732c39"
}

resource "aws_launch_template" "new_prod_standard" {
resource "aws_launch_template" "prod_standard" {
name = "prod_standard"
image_id = "ami-03857889452e262ff"
instance_type = "t3a.large"
Expand Down Expand Up @@ -272,7 +272,7 @@ resource "aws_launch_template" "new_prod_standard" {
}
}

resource "aws_launch_template" "new_prod_high_memory" {
resource "aws_launch_template" "prod_high_memory" {
name = "prod_high_memory"
image_id = "ami-03857889452e262ff"
instance_type = "r6i.8xlarge"
Expand Down
Loading