Merge branch 'main' into airflow-dev-irsa

ministryofjustice · Jun 4, 2024 · c4be3c0 · c4be3c0
2 parents 4924ef8 + 62f79dd
commit c4be3c0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/source/documentation/diagrams/architecture-diagrams.html.md.erb b/source/documentation/diagrams/architecture-diagrams.html.md.erb
@@ -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/)
diff --git a/terraform/aws/analytical-platform-data-production/airflow/eks.tf b/terraform/aws/analytical-platform-data-production/airflow/eks.tf
@@ -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
@@ -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
@@ -213,15 +213,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 {
@@ -239,15 +239,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 {

diff --git a/terraform/aws/analytical-platform-data-production/airflow/launch-templates.tf b/terraform/aws/analytical-platform-data-production/airflow/launch-templates.tf
@@ -52,7 +52,7 @@ resource "aws_launch_template" "dev_standard" {
 
 resource "aws_launch_template" "dev_high_memory" {
   name          = "dev_high_memory"
-  image_id      = "ami-060fa526de0521c07"
+  image_id      = "ami-03857889452e262ff"
   instance_type = "r6i.8xlarge"
 
   disable_api_stop        = false
@@ -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"
@@ -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"