chore: merge conflicts

Author: kav

main.tf

@@ -160,7 +160,7 @@ module "eks" {
   create_node_security_group = var.create_node_security_group
   endpoint_private_access    = true
   endpoint_public_access     = var.cluster_endpoint_public_access
-  enabled_log_types          = []
+  enabled_log_types          = var.cluster_enabled_log_types
 
   vpc_id         = var.stack_existing_vpc_config != null ? var.stack_existing_vpc_config.vpc_id : module.vpc.vpc_id
   subnet_ids     = var.stack_existing_vpc_config != null ? var.stack_existing_vpc_config.subnet_ids : module.vpc.private_subnets

variables.tf

@@ -193,6 +193,11 @@ variable "vpc_endpoints" {
   description = "vpc endpoints within the cluster vpc network, note: this only works when using the internal created VPC"
   default     = []
 }
+variable "cluster_enabled_log_types" {
+  type        = list(string)
+  default     = []
+  description = "List of EKS control plane log types to enable. Valid values: api, audit, authenticator, controllerManager, scheduler."
+}
 
 variable "cluster_endpoint_public_access" {
   type        = bool