diff --git a/fluent-bit.tf b/fluent-bit.tf index 64127c8..74aa094 100644 --- a/fluent-bit.tf +++ b/fluent-bit.tf @@ -14,7 +14,7 @@ module "fluent-bit" { log_group_name = try(var.fluent_bit_configs.log_group_name, "") != "" ? var.fluent_bit_configs.log_group_name : "fluent-bit-cloudwatch-${module.eks-cluster[0].cluster_id}" system_log_group_name = try(var.fluent_bit_configs.system_log_group_name, "") log_retention_days = try(var.fluent_bit_configs.log_retention_days, 90) - imagePullSecrets = try(var.fluent_bit_configs.imagePullSecrets, []) + image_pull_secrets = try(var.fluent_bit_configs.image_pull_secrets, []) values_yaml = try(var.fluent_bit_configs.values_yaml, "") diff --git a/modules/efs-csi/README.md b/modules/efs-csi/README.md index ff05e47..78d3332 100644 --- a/modules/efs-csi/README.md +++ b/modules/efs-csi/README.md @@ -57,7 +57,6 @@ No modules. | [cluster\_name](#input\_cluster\_name) | Parent cluster name | `string` | n/a | yes | | [cluster\_oidc\_arn](#input\_cluster\_oidc\_arn) | oidc arn of cluster | `string` | n/a | yes | | [efs\_id](#input\_efs\_id) | Id of EFS filesystem in AWS (Required) | `string` | n/a | yes | -| [helm\_install](#input\_helm\_install) | Helm Install | `bool` | `false` | no | | [storage\_classes](#input\_storage\_classes) | Additional storage class configurations: by default, 2 storage classes are created - efs-sc and efs-sc-root which has 0 uid. One can add another storage classes besides these 2. |
list(object({
name : string
provisioning_mode : optional(string, "efs-ap")
file_system_id : string
directory_perms : optional(string, "755")
base_path : optional(string, "/")
uid : optional(number)
}))
| `[]` | no | ## Outputs diff --git a/modules/efs-csi/main.tf b/modules/efs-csi/main.tf index b38cb6d..a52103d 100644 --- a/modules/efs-csi/main.tf +++ b/modules/efs-csi/main.tf @@ -1,5 +1,4 @@ resource "helm_release" "efs-driver" { - count = var.helm_install ? 1 : 0 name = "efs-csi" repository = "https://kubernetes-sigs.github.io/aws-efs-csi-driver/" chart = "aws-efs-csi-driver" diff --git a/modules/efs-csi/variables.tf b/modules/efs-csi/variables.tf index 3f46fa2..686acdb 100644 --- a/modules/efs-csi/variables.tf +++ b/modules/efs-csi/variables.tf @@ -13,12 +13,6 @@ variable "cluster_name" { type = string } -variable "helm_install" { - description = "Helm Install" - type = bool - default = false -} - variable "storage_classes" { description = "Additional storage class configurations: by default, 2 storage classes are created - efs-sc and efs-sc-root which has 0 uid. One can add another storage classes besides these 2." type = list(object({ diff --git a/modules/fluent-bit/README.md b/modules/fluent-bit/README.md index ca42ef4..bcce4c6 100644 --- a/modules/fluent-bit/README.md +++ b/modules/fluent-bit/README.md @@ -55,7 +55,6 @@ No modules. | [eks\_oidc\_root\_ca\_thumbprint](#input\_eks\_oidc\_root\_ca\_thumbprint) | n/a | `string` | n/a | yes | | [fluent\_bit\_config](#input\_fluent\_bit\_config) | You can add other inputs,outputs and filters which module doesn't have by default | `any` |
{
"cloudwatch_outputs_enabled": true,
"filters": "",
"inputs": "",
"outputs": ""
}
| no | | [fluent\_bit\_name](#input\_fluent\_bit\_name) | Container resource name. | `string` | `"fluent-bit"` | no | -| [imagePullSecrets](#input\_imagePullSecrets) | Secret name which can we use for download image | `list(string)` | `[]` | no | | [image\_pull\_secrets](#input\_image\_pull\_secrets) | Secret name which can we use for download image | `list(string)` | `[]` | no | | [kube\_namespaces](#input\_kube\_namespaces) | Kubernates namespaces | `list(string)` |
[
"kube.*",
"meta.*",
"adot.*",
"devops.*",
"cert-manager.*",
"git.*",
"opentelemetry.*",
"stakater.*",
"renovate.*"
]
| no | | [log\_filters](#input\_log\_filters) | Fluent bit doesn't send logs if message consists of this values | `list(string)` |
[
"kube-probe",
"health",
"prometheus",
"liveness"
]
| no | diff --git a/modules/fluent-bit/main.tf b/modules/fluent-bit/main.tf index efa09d2..9ca4763 100644 --- a/modules/fluent-bit/main.tf +++ b/modules/fluent-bit/main.tf @@ -29,11 +29,6 @@ resource "helm_release" "fluent-bit" { value = var.cluster_name } - set { - name = "imagePullSecrets" - value = var.imagePullSecrets - } - set { name = "serviceAccount.name" value = "fluent-bit" diff --git a/modules/fluent-bit/variables.tf b/modules/fluent-bit/variables.tf index 1825fa4..70ffae5 100644 --- a/modules/fluent-bit/variables.tf +++ b/modules/fluent-bit/variables.tf @@ -25,12 +25,6 @@ variable "namespace" { description = "k8s namespace fluent-bit should be deployed into." } -variable "imagePullSecrets" { - type = list(string) - default = [] - description = "Secret name which can we use for download image" -} - variable "create_namespace" { type = bool default = false