fix(DMVP-3211): ADOT resources configuration #94

viktoryathegreat · 2023-12-25T07:52:50Z

No description provided.

…rnally

github-actions · 2023-12-25T07:53:39Z

Output

[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Initializing environment for https://github.com/antonbabenko/pre-commit-terraform.
[INFO] Initializing environment for https://github.com/qoomon/git-conventional-commits.
[INFO] Initializing environment for https://github.com/zricethezav/gitleaks.
[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/zricethezav/gitleaks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
check for added large files..............................................Passed
check for merge conflicts................................................Passed
check vcs permalinks.....................................................Passed
fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
check yaml...............................................................Passed
check for merge conflicts................................................Passed
check for case conflicts.................................................Passed
mixed line ending........................................................Passed
detect aws credentials...................................................Passed
detect private key.......................................................Passed
Terraform fmt............................................................Passed
Terraform docs...........................................................Failed
- hook id: terraform_docs
- files were modified by this hook
Detect hardcoded secrets.................................................Passed

github-actions · 2023-12-25T08:07:24Z

Output

check for added large files..............................................Passed
check for merge conflicts................................................Passed
check vcs permalinks.....................................................Passed
fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
check yaml...............................................................Passed
check for merge conflicts................................................Passed
check for case conflicts.................................................Passed
mixed line ending........................................................Passed
detect aws credentials...................................................Passed
detect private key.......................................................Passed
Terraform fmt............................................................Passed
Terraform docs...........................................................Failed
- hook id: terraform_docs
- files were modified by this hook
Detect hardcoded secrets.................................................Passed

mrdntgrn · 2023-12-25T10:56:24Z

variables.tf

@@ -319,6 +319,16 @@ variable "adot_config" {
    log_retention          = optional(number, 14)
    helm_values            = optional(any, null)
    logging_enable         = optional(bool, false)
+    resources = object({


this requires to set resources field every time you pass adot_config variable, for example above test eks-with-adot will fail to plan/apply. to overcome this just use optional() by having something like this:

resources = optional(object({ limit = object({ cpu = optional(string, "200m") memory = optional(string, "200Mi") }) requests = object({ cpu = optional(string, "200m") memory = optional(string, "200Mi") }) }), { limit = { cpu = "200m" memory = "200Mi" } requests = { cpu = "200m" memory = "200Mi" } })

the ./tests/eks-with-adot still will fail as resources is required here for root module

github-actions · 2023-12-25T11:09:35Z

Output

check for added large files..............................................Passed
check for merge conflicts................................................Passed
check vcs permalinks.....................................................Passed
fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
check yaml...............................................................Passed
check for merge conflicts................................................Passed
check for case conflicts.................................................Passed
mixed line ending........................................................Passed
detect aws credentials...................................................Passed
detect private key.......................................................Passed
Terraform fmt............................................................Passed
Terraform docs...........................................................Failed
- hook id: terraform_docs
- files were modified by this hook
Detect hardcoded secrets.................................................Passed

mrdntgrn · 2023-12-25T11:21:33Z

modules/adot/variables.tf

@@ -74,3 +102,27 @@ variable "adot_log_group_name" {
  type        = string
  default     = "adot_log_group_name"
 }
+
+# variable "resources" {


why we need this commented block?
if no need just remove it, if we need it have some comment about this.

mrdntgrn · 2023-12-25T11:22:44Z

variables.tf

@@ -319,6 +319,16 @@ variable "adot_config" {
    log_retention          = optional(number, 14)
    helm_values            = optional(any, null)
    logging_enable         = optional(bool, false)
+    resources = object({


the ./tests/eks-with-adot still will fail as resources is required here for root module

github-actions · 2023-12-25T11:25:55Z

Output

check for added large files..............................................Passed
check for merge conflicts................................................Passed
check vcs permalinks.....................................................Passed
fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
check yaml...............................................................Passed
check for merge conflicts................................................Passed
check for case conflicts.................................................Passed
mixed line ending........................................................Passed
detect aws credentials...................................................Passed
detect private key.......................................................Passed
Terraform fmt............................................................Passed
Terraform docs...........................................................Failed
- hook id: terraform_docs
- files were modified by this hook
Detect hardcoded secrets.................................................Passed

github-actions · 2023-12-25T11:31:45Z

Output

check for added large files..............................................Passed
check for merge conflicts................................................Passed
check vcs permalinks.....................................................Passed
fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
check yaml...............................................................Passed
check for merge conflicts................................................Passed
check for case conflicts.................................................Passed
mixed line ending........................................................Passed
detect aws credentials...................................................Passed
detect private key.......................................................Passed
Terraform fmt............................................................Passed
Terraform docs...........................................................Failed
- hook id: terraform_docs
- files were modified by this hook
Detect hardcoded secrets.................................................Passed

github-actions · 2023-12-25T11:35:54Z

🎉 This PR is included in version 2.14.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

github-actions · 2023-12-25T11:36:06Z

Output

[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Initializing environment for https://github.com/antonbabenko/pre-commit-terraform.
[INFO] Initializing environment for https://github.com/qoomon/git-conventional-commits.
[INFO] Initializing environment for https://github.com/zricethezav/gitleaks.
[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/zricethezav/gitleaks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
check for added large files..............................................Passed
check for merge conflicts................................................Passed
check vcs permalinks.....................................................Passed
fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
check yaml...............................................................Passed
check for merge conflicts................................................Passed
check for case conflicts.................................................Passed
mixed line ending........................................................Passed
detect aws credentials...................................................Passed
detect private key.......................................................Passed
Terraform fmt............................................................Passed
Terraform docs...........................................................Failed
- hook id: terraform_docs
- files were modified by this hook
Detect hardcoded secrets.................................................Passed

viktoryathegreat added 4 commits December 25, 2023 11:37

fix(DMVP-3211): Added variables to handle adot resources configs exte…

ffe95b0

…rnally

fix(DMVP-3211): Changed adot_config variable

d1d316c

fix(DMVP-3211): Changed adot_config variable

6f1caaf

fix(DMVP-3211): Fixed test files

0695b15

fix(DMVP-3211): Added test

473803e

mrdntgrn reviewed Dec 25, 2023

View reviewed changes

fix(DMVP-3211): Made adot resources variable optional

cea3240

mrdntgrn reviewed Dec 25, 2023

View reviewed changes

fix(DMVP-3211): Deleted commented block

d8a0857

fix(DMVP-3211): Deleted commented block

4c50580

mrdntgrn approved these changes Dec 25, 2023

View reviewed changes

viktoryathegreat merged commit 3acdc34 into main Dec 25, 2023
35 checks passed

viktoryathegreat deleted the DMVP-3211-adot-resources branch December 25, 2023 11:35

github-actions bot added the released label Dec 25, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(DMVP-3211): ADOT resources configuration #94

fix(DMVP-3211): ADOT resources configuration #94

viktoryathegreat commented Dec 25, 2023

github-actions bot commented Dec 25, 2023

github-actions bot commented Dec 25, 2023

mrdntgrn Dec 25, 2023

mrdntgrn Dec 25, 2023 •

edited

Loading

github-actions bot commented Dec 25, 2023

mrdntgrn Dec 25, 2023

mrdntgrn Dec 25, 2023 •

edited

Loading

github-actions bot commented Dec 25, 2023

github-actions bot commented Dec 25, 2023

github-actions bot commented Dec 25, 2023

github-actions bot commented Dec 25, 2023

fix(DMVP-3211): ADOT resources configuration #94

fix(DMVP-3211): ADOT resources configuration #94

Conversation

viktoryathegreat commented Dec 25, 2023

github-actions bot commented Dec 25, 2023

Output

github-actions bot commented Dec 25, 2023

Output

mrdntgrn Dec 25, 2023

Choose a reason for hiding this comment

mrdntgrn Dec 25, 2023 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Dec 25, 2023

Output

mrdntgrn Dec 25, 2023

Choose a reason for hiding this comment

mrdntgrn Dec 25, 2023 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Dec 25, 2023

Output

github-actions bot commented Dec 25, 2023

Output

github-actions bot commented Dec 25, 2023

github-actions bot commented Dec 25, 2023

Output

mrdntgrn Dec 25, 2023 •

edited

Loading

mrdntgrn Dec 25, 2023 •

edited

Loading