Updates from pre-commit

examples/eks-istio/README.md

@@ -18,19 +18,24 @@ View the full documentation for this example [here](https://aws-observability.gi
 | Name | Version |
 |------|---------|
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.4.1 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_aws_observability_accelerator"></a> [aws\_observability\_accelerator](#module\_aws\_observability\_accelerator) | ../../ | n/a |
-| <a name="module_eks_blueprints_kubernetes_addons"></a> [eks\_blueprints\_kubernetes\_addons](#module\_eks\_blueprints\_kubernetes\_addons) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons | v4.32.1 |
+| <a name="module_eks_blueprints_addons"></a> [eks\_blueprints\_addons](#module\_eks\_blueprints\_addons) | aws-ia/eks-blueprints-addons/aws | ~> 1.0 |
 | <a name="module_eks_monitoring"></a> [eks\_monitoring](#module\_eks\_monitoring) | ../../modules/eks-monitoring | n/a |
 
 ## Resources
 
 | Name | Type |
 |------|------|
+| [helm_release.istio_base](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
+| [helm_release.istio_ingress](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
+| [helm_release.istiod](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
+| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
 | [aws_eks_cluster.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster) | data source |
 | [aws_eks_cluster_auth.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster_auth) | data source |
 
@@ -42,6 +47,10 @@ View the full documentation for this example [here](https://aws-observability.gi
 | <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | Name of the EKS cluster | `string` | `"eks-cluster-with-vpc"` | no |
 | <a name="input_enable_dashboards"></a> [enable\_dashboards](#input\_enable\_dashboards) | Enables or disables curated dashboards. Dashboards are managed by the Grafana Operator | `bool` | `true` | no |
 | <a name="input_grafana_api_key"></a> [grafana\_api\_key](#input\_grafana\_api\_key) | API key for authorizing the Grafana provider to make changes to Amazon Managed Grafana | `string` | n/a | yes |
+| <a name="input_istio_chart_url"></a> [istio\_chart\_url](#input\_istio\_chart\_url) | Helm repository for Tetrate Istio charts | `string` | `"https://tis.tetrate.io/charts"` | no |
+| <a name="input_istio_chart_version"></a> [istio\_chart\_version](#input\_istio\_chart\_version) | Helm chart version for Tetrate Istio charts | `string` | `"1.20.1"` | no |
+| <a name="input_istio_global_hub"></a> [istio\_global\_hub](#input\_istio\_global\_hub) | Tetrate Istio container repository | `string` | `"containers.istio.tetratelabs.com"` | no |
+| <a name="input_istio_global_tag"></a> [istio\_global\_tag](#input\_istio\_global\_tag) | Tetrate Istio container tag | `string` | `"1.20.1-tetrate0"` | no |
 | <a name="input_managed_grafana_workspace_id"></a> [managed\_grafana\_workspace\_id](#input\_managed\_grafana\_workspace\_id) | Amazon Managed Grafana Workspace ID | `string` | n/a | yes |
 | <a name="input_managed_prometheus_workspace_id"></a> [managed\_prometheus\_workspace\_id](#input\_managed\_prometheus\_workspace\_id) | Amazon Managed Service for Prometheus Workspace ID | `string` | `""` | no |
 

examples/eks-istio/main.tf

@@ -58,7 +58,7 @@ module "aws_observability_accelerator" {
 }
 
 module "eks_blueprints_addons" {
-  source = "aws-ia/eks-blueprints-addons/aws"
+  source  = "aws-ia/eks-blueprints-addons/aws"
   version = "~> 1.0" #ensure to update this to the latest/desired version
 
   cluster_name      = var.eks_cluster_id
@@ -68,7 +68,7 @@ module "eks_blueprints_addons" {
 
   # Add-ons
   enable_metrics_server               = true
-  enable_cluster_autoscaler          = true
+  enable_cluster_autoscaler           = true
   enable_aws_load_balancer_controller = true
 
   tags = local.tags
@@ -86,12 +86,12 @@ resource "helm_release" "istio_base" {
   create_namespace = true
   version          = var.istio_chart_version
   wait             = false
-  
+
   set {
     name  = "global.tag"
     value = var.istio_global_tag
   }
-  
+
   set {
     name  = "global.hub"
     value = var.istio_global_hub
@@ -109,12 +109,12 @@ resource "helm_release" "istiod" {
   namespace  = "istio-system"
   version    = var.istio_chart_version
   wait       = false
-  
+
   set {
     name  = "global.tag"
     value = var.istio_global_tag
   }
-  
+
   set {
     name  = "global.hub"
     value = var.istio_global_hub
@@ -132,22 +132,22 @@ resource "helm_release" "istio_ingress" {
   namespace  = "istio-system"
   version    = var.istio_chart_version
   wait       = false
-  
+
   set {
     name  = "global.tag"
     value = var.istio_global_tag
   }
-  
+
   set {
     name  = "global.hub"
     value = var.istio_global_hub
   }
-  
+
   set {
     name  = "gateways.istio-ingressgateway.serviceAnnotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-type"
     value = "nlb"
   }
-  
+
   set {
     name  = "gateways.istio-ingressgateway.serviceAnnotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-scheme"
     value = "internet-facing"

examples/eks-istio/variables.tf

@@ -54,4 +54,4 @@ variable "istio_global_hub" {
   description = "Tetrate Istio container repository"
   type        = string
   default     = "containers.istio.tetratelabs.com"
-}
+}

modules/eks-monitoring/README.md

@@ -59,6 +59,7 @@ See examples using this Terraform modules in the **Amazon EKS** section of [this
 | [kubectl_manifest.api_server_dashboards](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
 | [kubectl_manifest.flux_gitrepository](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
 | [kubectl_manifest.flux_kustomization](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
+| [kubectl_manifest.istio_monitoring_dashboards](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
 | [kubectl_manifest.kubeproxy_monitoring_dashboard](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
 | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
 | [aws_eks_cluster.eks_cluster](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster) | data source |

modules/eks-monitoring/dashboards.tf

@@ -118,7 +118,7 @@ YAML
 }
 
 resource "kubectl_manifest" "istio_monitoring_dashboards" {
-  yaml_body = <<YAML
+  yaml_body  = <<YAML
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
@@ -138,6 +138,6 @@ spec:
       GRAFANA_ISTIO_PERF_DASH_URL: ${local.istio_pattern_config.dashboards.performance}
       GRAFANA_ISTIO_SERVICE_DASH_URL: ${local.istio_pattern_config.dashboards.service}
 YAML
-  count = local.istio_pattern_config.enable_dashboards ? 1 : 0
+  count      = local.istio_pattern_config.enable_dashboards ? 1 : 0
   depends_on = [module.external_secrets]
-}
+}

modules/eks-monitoring/patterns/istio/README.md

@@ -21,7 +21,6 @@ Provides monitoring for Istio based workloads with the following resources:
 | Name | Version |
 |------|---------|
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
-| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | >= 2.0.3 |
 
 ## Modules
 
@@ -33,7 +32,6 @@ No modules.
 |------|------|
 | [aws_prometheus_rule_group_namespace.alerting_rules](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/prometheus_rule_group_namespace) | resource |
 | [aws_prometheus_rule_group_namespace.recording_rules](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/prometheus_rule_group_namespace) | resource |
-| [kubectl_manifest.flux_kustomization](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
 
 ## Inputs
 

modules/eks-monitoring/patterns/istio/main.tf

@@ -186,4 +186,4 @@ resource "aws_prometheus_rule_group_namespace" "alerting_rules" {
             sum(rate(istio_requests_total{reporter="source", source_workload="istio-ingressgateway",response_code="200",destination_service_namespace=~"service-graph.*"}[5m])) < 1490
           for: 30m
     EOF
-}
+}