From 05882e1aee7b44960f6ec185901ba66c99a7df62 Mon Sep 17 00:00:00 2001
From: Josh Diamond <joshdiamondthedev@gmail.com>
Date: Thu, 18 Jul 2024 15:01:54 -0700
Subject: [PATCH] disable locked package variables + allow aws_volume_size to
 be configurable for registry_nodes

---
 packages/aws/rancher-registry.yaml                     | 8 +-------
 packages/aws/registry.yaml                             | 5 +----
 templates/aws/registry_nodes/terraform/pools/corral.tf | 1 +
 templates/aws/registry_nodes/terraform/pools/main.tf   | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/aws/rancher-registry.yaml b/packages/aws/rancher-registry.yaml
index 9a2dc3d..a07d025 100644
--- a/packages/aws/rancher-registry.yaml
+++ b/packages/aws/rancher-registry.yaml
@@ -13,17 +13,11 @@ templates:
 variables:
   cni:
     - calico
-  kubernetes_version:
-    - v1.25.16+rke2r1
-    - v1.26.14+rke2r1
   registry_auth:
     - global
     - enabled
     - disabled
   docker_compose_version:
     - 2.18.1
-  rancher_version:
-    - 2.7.10
-    - 2.8.2
   cert_manager_version:
-    - 1.11.0
+    - 1.15.0
diff --git a/packages/aws/registry.yaml b/packages/aws/registry.yaml
index ffd5a07..7001232 100644
--- a/packages/aws/registry.yaml
+++ b/packages/aws/registry.yaml
@@ -15,8 +15,5 @@ variables:
     - ecr
   docker_compose_version:
     - 2.18.1
-  rancher_version:
-    - 2.8.2
   cert_manager_version:
-    - 1.11.0
-  
+    - 1.15.0
\ No newline at end of file
diff --git a/templates/aws/registry_nodes/terraform/pools/corral.tf b/templates/aws/registry_nodes/terraform/pools/corral.tf
index f23e839..ed6bdbe 100644
--- a/templates/aws/registry_nodes/terraform/pools/corral.tf
+++ b/templates/aws/registry_nodes/terraform/pools/corral.tf
@@ -14,6 +14,7 @@ variable "aws_ssh_user" {}
 variable "aws_security_group" {}
 variable "aws_vpc" {}
 variable "aws_subnet" {}
+variable "aws_volume_size" {}
 variable "install_docker" {}
 variable "instance_type" {}
 variable "airgap_setup" {}
diff --git a/templates/aws/registry_nodes/terraform/pools/main.tf b/templates/aws/registry_nodes/terraform/pools/main.tf
index fcfbe26..9a28a45 100644
--- a/templates/aws/registry_nodes/terraform/pools/main.tf
+++ b/templates/aws/registry_nodes/terraform/pools/main.tf
@@ -44,7 +44,7 @@ resource "aws_instance" "registry" {
 
   ebs_block_device {
     device_name           = "/dev/sda1"
-    volume_size           = "200"
+    volume_size           = "${var.aws_volume_size}"
     volume_type           = "gp3"
     encrypted             = true
     delete_on_termination = true