From a26a8fa172e374f3827845f2de0717d2e6194ef3 Mon Sep 17 00:00:00 2001 From: sboardwell Date: Thu, 21 Dec 2023 12:21:33 +0100 Subject: [PATCH 1/4] Ensure any PVC includes the custom tags --- blueprints/01-getting-started/main.tf | 8 ++++++++ blueprints/02-at-scale/main.tf | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/blueprints/01-getting-started/main.tf b/blueprints/01-getting-started/main.tf index f4aa061c..14873e1e 100644 --- a/blueprints/01-getting-started/main.tf +++ b/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 = {} diff --git a/blueprints/02-at-scale/main.tf b/blueprints/02-at-scale/main.tf index ee27d7c6..7420d051 100644 --- a/blueprints/02-at-scale/main.tf +++ b/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 = {} From 37bf10666368418e09a02687b83153e72687b88e Mon Sep 17 00:00:00 2001 From: sboardwell Date: Thu, 21 Dec 2023 12:29:47 +0100 Subject: [PATCH 2/4] chore: pre-commit --- .github/CODEOWNERS | 2 +- .gitignore | 6 +++--- .terraform-docs.yml | 2 +- values.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 073dc0c1..1bbb7e21 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ * @carlosrodlop * @ryecarrigan -* @sboardwell \ No newline at end of file +* @sboardwell diff --git a/.gitignore b/.gitignore index 928a8ba6..cfcb7236 100644 --- a/.gitignore +++ b/.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 \ No newline at end of file +kubeconfig*.yaml diff --git a/.terraform-docs.yml b/.terraform-docs.yml index 457e7259..11f3ea25 100644 --- a/.terraform-docs.yml +++ b/.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" \ No newline at end of file +version: ">= 0.16.0, < 1.0.0" diff --git a/values.yml b/values.yml index 55dc9bd5..4c017285 100644 --- a/values.yml +++ b/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 \ No newline at end of file + -XX:MaxRAMPercentage=70.0 From 0b3cd0a865bdb0f868282f7e6a38020b206b9616 Mon Sep 17 00:00:00 2001 From: sboardwell Date: Thu, 21 Dec 2023 12:42:56 +0100 Subject: [PATCH 3/4] Do not use the pull rewuest repo name --- .github/workflows/terraform-docs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/terraform-docs.yml b/.github/workflows/terraform-docs.yml index a8e22aee..0520b131 100644 --- a/.github/workflows/terraform-docs.yml +++ b/.github/workflows/terraform-docs.yml @@ -13,7 +13,6 @@ jobs: steps: - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0 with: - repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.event.pull_request.head.ref }} - name: Render documentation and push changes back to branch From 6e6f3c93e060c6064ea88ea3a0a18a17122306ec Mon Sep 17 00:00:00 2001 From: sboardwell Date: Thu, 21 Dec 2023 12:44:47 +0100 Subject: [PATCH 4/4] Revert "Do not use the pull rewuest repo name" This reverts commit 0b3cd0a865bdb0f868282f7e6a38020b206b9616. --- .github/workflows/terraform-docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/terraform-docs.yml b/.github/workflows/terraform-docs.yml index 0520b131..a8e22aee 100644 --- a/.github/workflows/terraform-docs.yml +++ b/.github/workflows/terraform-docs.yml @@ -13,6 +13,7 @@ jobs: steps: - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0 with: + repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.event.pull_request.head.ref }} - name: Render documentation and push changes back to branch