Merge pull request #33 from sboardwell/add-tags-to-all-ebs-volumes

Ensure any PVC includes the custom tags

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 * @carlosrodlop
 * @ryecarrigan
-* @sboardwell
+* @sboardwell

.gitignore

@@ -10,8 +10,8 @@ crash.log
 crash.*.log
 
 # Exclude all .tfvars files, which are likely to contain sensitive data, such as
-# password, private keys, and other secrets. These should not be part of version 
-# control as they are data points which are potentially sensitive and subject 
+# password, private keys, and other secrets. These should not be part of version
+# control as they are data points which are potentially sensitive and subject
 # to change depending on the environment.
 *.tfvars
 *.tfvars.json
@@ -39,4 +39,4 @@ terraform.rc
 # Assests created via Blueprints
 *.log
 .deployed
-kubeconfig*.yaml
+kubeconfig*.yaml

.terraform-docs.yml

@@ -37,4 +37,4 @@ sections:
     - outputs
 
 # see https://terraform-docs.io/user-guide/configuration/version/
-version: ">= 0.16.0, < 1.0.0"
+version: ">= 0.16.0, < 1.0.0"

blueprints/01-getting-started/main.tf

@@ -62,6 +62,14 @@ module "eks_blueprints_addons" {
   eks_addons = {
     aws-ebs-csi-driver = {
       service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
+      # ensure any PVC created also includes the custom tags
+      configuration_values = jsonencode(
+        {
+          controller = {
+            extraVolumeTags = local.tags
+          }
+        }
+      )
     }
     coredns    = {}
     vpc-cni    = {}

blueprints/02-at-scale/main.tf

@@ -81,6 +81,14 @@ module "eks_blueprints_addons" {
   eks_addons = {
     aws-ebs-csi-driver = {
       service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
+      # ensure any PVC created also includes the custom tags
+      configuration_values = jsonencode(
+        {
+          controller = {
+            extraVolumeTags = local.tags
+          }
+        }
+      )
     }
     coredns    = {}
     vpc-cni    = {}

values.yml

@@ -29,8 +29,8 @@ OperationsCenter:
       FirstName: ${LicFirstName}
       LastName: ${LicLastName}
       Email: ${LicEmail}
-      Company: ${LicCompany}    
+      Company: ${LicCompany}
 Master:
   JavaOpts: >-
     -XX:InitialRAMPercentage=70.0
-    -XX:MaxRAMPercentage=70.0
+    -XX:MaxRAMPercentage=70.0