Run precommit

Author: ankur6405

.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

README.md

@@ -80,13 +80,7 @@ module "eks_addons" {
 
 | Release | Kubernetes 1.23 | Kubernetes 1.24  | Kubernetes 1.25 |  Kubernetes 1.26 |
 |------------------|------------------|------------------|----------------------|----------------------|
-| Release 1.0.0  | ✔  | ✗  | ✗ | ✗ |
-| Release 1.0.1  | ✔  | ✔  | ✔ | ✗ |
-| Release 1.1.0  | ✔  | ✔  | ✔ | ✗ |
-| Release 2.0.0  | ✔  | ✔  | ✔ | ✗ |
-| Release 2.1.0  | ✔  | ✔  | ✔ | ✗  |
-| Release 3.0.0  | ✔  | ✔  | ✔ |  ✔ |
-| Release 3.1.0  | ✔  | ✔  | ✔ |  ✔ |
+| Release 1.0.0  | ✔  | ✔  | ✔ | ✔ |
 
 ## IAM Permissions
 The required IAM permissions to create resources from this module can be found [here](https://github.com/squareops/terraform-aws-eks-addons.git/blob/main/IAM.md)
@@ -217,13 +211,13 @@ Before enabling the **Kubecost** addon for your Amazon EKS cluster, please make
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_efs"></a> [efs](#module\_efs) | ./addons/efs | n/a |
-| <a name="module_istio"></a> [istio](#module\_istio) | ./addons/istio | n/a |
-| <a name="module_k8s_addons"></a> [k8s\_addons](#module\_k8s\_addons) | ./EKS-Blueprint/modules/kubernetes-addons | n/a |
-| <a name="module_karpenter_provisioner"></a> [karpenter\_provisioner](#module\_karpenter\_provisioner) | ./addons/karpenter_provisioner | n/a |
-| <a name="module_service_monitor_crd"></a> [service\_monitor\_crd](#module\_service\_monitor\_crd) | ./addons/service_monitor_crd | n/a |
-| <a name="module_single_az_sc"></a> [single\_az\_sc](#module\_single\_az\_sc) | ./addons/aws-ebs-storage-class | n/a |
-| <a name="module_velero"></a> [velero](#module\_velero) | ./addons/velero | n/a |
+| <a name="module_efs"></a> [efs](#module\_efs) | ./modules/efs | n/a |
+| <a name="module_istio"></a> [istio](#module\_istio) | ./modules/istio | n/a |
+| <a name="module_k8s_addons"></a> [k8s\_addons](#module\_k8s\_addons) | ./modules/kubernetes-addons | n/a |
+| <a name="module_karpenter_provisioner"></a> [karpenter\_provisioner](#module\_karpenter\_provisioner) | ./modules/karpenter_provisioner | n/a |
+| <a name="module_service_monitor_crd"></a> [service\_monitor\_crd](#module\_service\_monitor\_crd) | ./modules/service_monitor_crd | n/a |
+| <a name="module_single_az_sc"></a> [single\_az\_sc](#module\_single\_az\_sc) | ./modules/aws-ebs-storage-class | n/a |
+| <a name="module_velero"></a> [velero](#module\_velero) | ./modules/velero | n/a |
 
 ## Resources
 
@@ -315,8 +309,8 @@ Before enabling the **Kubecost** addon for your Amazon EKS cluster, please make
 | <a name="output_environment"></a> [environment](#output\_environment) | Environment Name for the EKS cluster |
 | <a name="output_internal_nginx_ingress_controller_dns_hostname"></a> [internal\_nginx\_ingress\_controller\_dns\_hostname](#output\_internal\_nginx\_ingress\_controller\_dns\_hostname) | DNS hostname of the NGINX Ingress Controller that can be used to access it from within the cluster. |
 | <a name="output_istio_ingressgateway_dns_hostname"></a> [istio\_ingressgateway\_dns\_hostname](#output\_istio\_ingressgateway\_dns\_hostname) | DNS hostname of the Istio Ingress Gateway. |
-| <a name="output_kubeclarity"></a> [kubeclarity](#output\_kubeclarity) | Kubeclarity\_Info |
-| <a name="output_kubecost"></a> [kubecost](#output\_kubecost) | Kubecost\_Info |
+| <a name="output_kubeclarity"></a> [kubeclarity](#output\_kubeclarity) | Kubeclarity\_credentials |
+| <a name="output_kubecost"></a> [kubecost](#output\_kubecost) | Kubecost\_credentials |
 | <a name="output_nginx_ingress_controller_dns_hostname"></a> [nginx\_ingress\_controller\_dns\_hostname](#output\_nginx\_ingress\_controller\_dns\_hostname) | DNS hostname of the NGINX Ingress Controller. |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
@@ -361,4 +355,4 @@ We provide [support](https://squareops.com/contact-us/) on all of our projects,
 
 You can find more information about our company on this [squareops.com](https://squareops.com/), follow us on [Linkedin](https://www.linkedin.com/company/squareops-technologies-pvt-ltd/), or fill out a [job application](https://squareops.com/careers/). If you have any questions or would like assistance with your cloud strategy and implementation, please don't hesitate to [contact us](https://squareops.com/contact-us/).
 
-<!-- END OF PRE-COMMIT-PIKE DOCS HOOK -->
+<!-- END OF PRE-COMMIT-PIKE DOCS HOOK -->

examples/complete/README.md

@@ -26,7 +26,7 @@ This example is useful for users who are new to a module and want to quickly lea
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_eks-addons"></a> [eks\_addons](#module\_eks\_addons) | squareops/eks-addons/aws | n/a |
+| <a name="module_eks-addons"></a> [eks-addons](#module\_eks-addons) | squareops/eks-addons/aws | n/a |
 
 ## Resources
 

examples/complete/main.tf

@@ -36,7 +36,7 @@ module "eks-addons" {
   external_secrets_enabled            = true
   amazon_eks_vpc_cni_enabled          = true
   cluster_autoscaler_enabled          = true
-  service_monitor_crd_enabled         = true 
+  service_monitor_crd_enabled         = true
   enable_aws_load_balancer_controller = true
   istio_enabled                       = true
   istio_config = {
@@ -49,7 +49,7 @@ module "eks-addons" {
     prometheus_monitoring_enabled       = true
     cert_manager_cluster_issuer_enabled = true
   }
-  karpenter_provisioner_enabled       = false
+  karpenter_provisioner_enabled = false
   karpenter_provisioner_config = {
     private_subnet_name    = "private-subnet-name"
     instance_capacity_type = ["on-demand"]

main.tf

@@ -305,10 +305,10 @@ data "aws_eks_addon_version" "kubecost" {
 }
 
 resource "aws_eks_addon" "kubecost" {
-  count                    = var.kubecost_enabled ? 1 : 0
-  cluster_name             = var.eks_cluster_name
-  addon_name               = "kubecost_kubecost"
-  addon_version            = data.aws_eks_addon_version.kubecost.version
+  count         = var.kubecost_enabled ? 1 : 0
+  cluster_name  = var.eks_cluster_name
+  addon_name    = "kubecost_kubecost"
+  addon_version = data.aws_eks_addon_version.kubecost.version
   # resolve_conflicts        = "OVERWRITE"
   service_account_role_arn = var.worker_iam_role_arn
   preserve                 = true

modules/kubernetes-addons/README.md

@@ -20,9 +20,6 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_argo_rollouts"></a> [argo\_rollouts](#module\_argo\_rollouts) | ./argo-rollouts | n/a |
-| <a name="module_argo_workflows"></a> [argo\_workflows](#module\_argo\_workflows) | ./argo-workflows | n/a |
-| <a name="module_argocd"></a> [argocd](#module\_argocd) | ./argocd | n/a |
 | <a name="module_aws_cloudwatch_metrics"></a> [aws\_cloudwatch\_metrics](#module\_aws\_cloudwatch\_metrics) | ./aws-cloudwatch-metrics | n/a |
 | <a name="module_aws_coredns"></a> [aws\_coredns](#module\_aws\_coredns) | ./aws-coredns | n/a |
 | <a name="module_aws_ebs_csi_driver"></a> [aws\_ebs\_csi\_driver](#module\_aws\_ebs\_csi\_driver) | ./aws-ebs-csi-driver | n/a |
@@ -47,13 +44,10 @@
 | <a name="module_kubecost"></a> [kubecost](#module\_kubecost) | ./kubecost | n/a |
 | <a name="module_kubernetes_dashboard"></a> [kubernetes\_dashboard](#module\_kubernetes\_dashboard) | ./kubernetes-dashboard | n/a |
 | <a name="module_metrics_server"></a> [metrics\_server](#module\_metrics\_server) | ./metrics-server | n/a |
-| <a name="module_portworx"></a> [portworx](#module\_portworx) | portworx/portworx-addon/eksblueprints | 0.0.6 |
 | <a name="module_reloader"></a> [reloader](#module\_reloader) | ./reloader | n/a |
 | <a name="module_secrets_store_csi_driver"></a> [secrets\_store\_csi\_driver](#module\_secrets\_store\_csi\_driver) | ./secrets-store-csi-driver | n/a |
 | <a name="module_strimzi_kafka_operator"></a> [strimzi\_kafka\_operator](#module\_strimzi\_kafka\_operator) | ./strimzi-kafka-operator | n/a |
-| <a name="module_sysdig_agent"></a> [sysdig\_agent](#module\_sysdig\_agent) | sysdiglabs/sysdig-addon/eksblueprints | 0.0.1 |
 | <a name="module_tetrate_istio"></a> [tetrate\_istio](#module\_tetrate\_istio) | ./tetrate-istio | n/a |
-| <a name="module_traefik"></a> [traefik](#module\_traefik) | ./traefik | n/a |
 | <a name="module_vault"></a> [vault](#module\_vault) | hashicorp/hashicorp-vault-eks-addon/aws | 1.0.0-rc2 |
 | <a name="module_velero"></a> [velero](#module\_velero) | ./velero | n/a |
 | <a name="module_vpa"></a> [vpa](#module\_vpa) | ./vpa | n/a |
@@ -293,9 +287,6 @@
 
 | Name | Description |
 |------|-------------|
-| <a name="output_argo_rollouts"></a> [argo\_rollouts](#output\_argo\_rollouts) | Map of attributes of the Helm release and IRSA created |
-| <a name="output_argo_workflows"></a> [argo\_workflows](#output\_argo\_workflows) | Map of attributes of the Helm release and IRSA created |
-| <a name="output_argocd"></a> [argocd](#output\_argocd) | Map of attributes of the Helm release and IRSA created |
 | <a name="output_aws_cloudwatch_metrics"></a> [aws\_cloudwatch\_metrics](#output\_aws\_cloudwatch\_metrics) | Map of attributes of the Helm release and IRSA created |
 | <a name="output_aws_coredns"></a> [aws\_coredns](#output\_aws\_coredns) | Map of attributes of the Helm release and IRSA created |
 | <a name="output_aws_ebs_csi_driver"></a> [aws\_ebs\_csi\_driver](#output\_aws\_ebs\_csi\_driver) | Map of attributes of the Helm release and IRSA created |
@@ -323,7 +314,6 @@
 | <a name="output_reloader"></a> [reloader](#output\_reloader) | Map of attributes of the Helm release and IRSA created |
 | <a name="output_secrets_store_csi_driver"></a> [secrets\_store\_csi\_driver](#output\_secrets\_store\_csi\_driver) | Map of attributes of the Helm release and IRSA created |
 | <a name="output_strimzi_kafka_operator"></a> [strimzi\_kafka\_operator](#output\_strimzi\_kafka\_operator) | Map of attributes of the Helm release and IRSA created |
-| <a name="output_traefik"></a> [traefik](#output\_traefik) | Map of attributes of the Helm release and IRSA created |
 | <a name="output_velero"></a> [velero](#output\_velero) | Map of attributes of the Helm release and IRSA created |
 | <a name="output_vpa"></a> [vpa](#output\_vpa) | Map of attributes of the Helm release and IRSA created |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

modules/kubernetes-addons/locals.tf

@@ -14,20 +14,20 @@ locals {
     ingressNginx              = var.enable_ingress_nginx ? module.ingress_nginx[0].argocd_gitops_config : null
     keda                      = var.enable_keda ? module.keda[0].argocd_gitops_config : null
     metricsServer             = var.enable_metrics_server ? module.metrics_server[0].argocd_gitops_config : null
-    tetrateIstio            = var.enable_tetrate_istio ? module.tetrate_istio[0].argocd_gitops_config : null
-    vault                   = var.enable_vault ? module.vault[0].argocd_gitops_config : null
-    vpa                     = var.enable_vpa ? module.vpa[0].argocd_gitops_config : null
-    karpenter               = var.enable_karpenter ? module.karpenter[0].argocd_gitops_config : null
-    kubernetesDashboard     = var.enable_kubernetes_dashboard ? module.kubernetes_dashboard[0].argocd_gitops_config : null
-    awsCloudWatchMetrics    = var.enable_aws_cloudwatch_metrics ? module.aws_cloudwatch_metrics[0].argocd_gitops_config : null
-    externalDns             = var.enable_external_dns ? module.external_dns[0].argocd_gitops_config : null
-    externalSecrets         = var.enable_external_secrets ? module.external_secrets[0].argocd_gitops_config : null
-    velero                  = var.enable_velero ? module.velero[0].argocd_gitops_config : null
-    kubecost                = var.kubecost_enabled ? module.kubecost[0].argocd_gitops_config : null
-    strimziKafkaOperator    = var.enable_strimzi_kafka_operator ? module.strimzi_kafka_operator[0].argocd_gitops_config : null
-    kyverno                 = var.enable_kyverno ? { enable = true } : null
-    kyverno_policies        = var.enable_kyverno ? { enable = true } : null
-    kyverno_policy_reporter = var.enable_kyverno ? { enable = true } : null
+    tetrateIstio              = var.enable_tetrate_istio ? module.tetrate_istio[0].argocd_gitops_config : null
+    vault                     = var.enable_vault ? module.vault[0].argocd_gitops_config : null
+    vpa                       = var.enable_vpa ? module.vpa[0].argocd_gitops_config : null
+    karpenter                 = var.enable_karpenter ? module.karpenter[0].argocd_gitops_config : null
+    kubernetesDashboard       = var.enable_kubernetes_dashboard ? module.kubernetes_dashboard[0].argocd_gitops_config : null
+    awsCloudWatchMetrics      = var.enable_aws_cloudwatch_metrics ? module.aws_cloudwatch_metrics[0].argocd_gitops_config : null
+    externalDns               = var.enable_external_dns ? module.external_dns[0].argocd_gitops_config : null
+    externalSecrets           = var.enable_external_secrets ? module.external_secrets[0].argocd_gitops_config : null
+    velero                    = var.enable_velero ? module.velero[0].argocd_gitops_config : null
+    kubecost                  = var.kubecost_enabled ? module.kubecost[0].argocd_gitops_config : null
+    strimziKafkaOperator      = var.enable_strimzi_kafka_operator ? module.strimzi_kafka_operator[0].argocd_gitops_config : null
+    kyverno                   = var.enable_kyverno ? { enable = true } : null
+    kyverno_policies          = var.enable_kyverno ? { enable = true } : null
+    kyverno_policy_reporter   = var.enable_kyverno ? { enable = true } : null
   }
 
   addon_context = {