Added fix for eks 1.25 tf-run.data and note on default eks_instance_d…

…isk_size
terraform-modules · Nov 15, 2023 · a921f8d · a921f8d
1 parent 491ae95
commit a921f8d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/examples/full-cluster-tf-upgrade/1.25/README.md b/examples/full-cluster-tf-upgrade/1.25/README.md
@@ -92,6 +92,7 @@ You need to change these values:
 These are tracked in the repo cloud-information/aws/documentation/containers/ (fix link).
 * region: include the correct region. This really is a duplicate of the `region` variable, so it may be removed in the future.
 * domain: this is the domain name of the clsuter, consisting of the cluster name and the proper domain name for the environment/VPC.
+* eks_instance_disk_size: this should be default to 40Gb for most use-cases; only change this if you have special requirement and have exception approval.
 * eks_vpc_name: replace *vpc_full_name* with the appropriate vpc full name. This is used to find the vpc ID.
 
 All the others are subject to your configuration. They are a good starting point, but can vary.

diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/tf-run.data b/examples/full-cluster-tf-upgrade/1.25/common-services/tf-run.data
@@ -49,3 +49,7 @@ module.cert
 module.cert
 ALL
 ALL
+
+COMMENT cd cluster-autoscaler and tf-run.sh apply
+COMMENT come back to this directory
+COMMENT cd cloudwatch-agent and tf-run.sh apply 
diff --git a/examples/full-cluster-tf-upgrade/1.25/irsa-roles/tf-run.data b/examples/full-cluster-tf-upgrade/1.25/irsa-roles/tf-run.data
@@ -11,5 +11,3 @@ LINK variables.application_tags.auto.tfvars
 
 ALL
 COMMAND tf-directory-setup.py -l s3
-
-COMMENT cd cluster-autoscaler and tf-run.sh apply
diff --git a/examples/full-cluster-tf-upgrade/1.25/tf-run.data b/examples/full-cluster-tf-upgrade/1.25/tf-run.data
@@ -63,12 +63,16 @@ STOP Once applied in this subdirectory, come back here and continue with step %%
 
 TAG setup-irsa
 COMMENT cd irsa-roles and tf-run.sh apply
-COMMENT   Note: irsa-roles has other subdirectories to be applied, follow the directions from tf-run there
 STOP Once applied in this subdirectory, come back here and continue with step %%NEXT%% (tag:setup-common-services)
 
 TAG setup-common-services
 COMMENT cd common-services and tf-run.sh apply
 COMMENT  Notes: this subdirectory is complicated, and it has a certificate step which is manual
+COMMENT  Notes: common-services also has other subdirectories to be applied, follow the directions from tf-run there
+STOP Once applied in this subdirectory, come back here and continue with step %%NEXT%% (tag:setup-cluster-roles)
+
+TAG setup-cluster-roles
+COMMENT cd cluster-roles and tf-run.sh apply
 STOP Once applied in this subdirectory, come back here and continue with step %%NEXT%% (tag:complete)
 
 TAG complete