From 3451706315f0f1d14713483ec660b14777c56d46 Mon Sep 17 00:00:00 2001 From: Rodrigue Koffi Date: Mon, 19 Sep 2022 09:01:17 +0200 Subject: [PATCH] Fixes (#32) * Apply pre-commit * Pin dependencies modules --- README.md | 2 +- examples/eks-cluster-with-vpc/main.tf | 4 ++-- examples/existing-cluster-with-base-and-infra/README.md | 1 - .../terraform.tfvars | 2 +- modules/add-ons/adot-operator/README.md | 2 +- modules/workloads/infra/README.md | 9 +-------- modules/workloads/infra/dashboards/cluster.json | 2 +- .../workloads/infra/dashboards/namespace-workloads.json | 2 +- modules/workloads/infra/dashboards/nodes.json | 2 +- modules/workloads/infra/main.tf | 2 +- modules/workloads/nginx/README.md | 2 +- outputs.tf | 2 +- 12 files changed, 12 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 67266a7..30d2bc6 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ If you are interested in contributing to EKS Blueprints, see the [Contribution g | Name | Description | |------|-------------| -| [aws\_region](#output\_aws\_region) | EKS Cluster Id | +| [aws\_region](#output\_aws\_region) | AWS Region | | [eks\_cluster\_id](#output\_eks\_cluster\_id) | EKS Cluster Id | | [eks\_cluster\_version](#output\_eks\_cluster\_version) | EKS Cluster version | | [grafana\_dashboards\_folder\_id](#output\_grafana\_dashboards\_folder\_id) | Grafana folder ID for automatic dashboards. Required by workload modules | diff --git a/examples/eks-cluster-with-vpc/main.tf b/examples/eks-cluster-with-vpc/main.tf index 6aee289..2b4cc99 100644 --- a/examples/eks-cluster-with-vpc/main.tf +++ b/examples/eks-cluster-with-vpc/main.tf @@ -41,7 +41,7 @@ locals { #--------------------------------------------------------------- module "eks_blueprints" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints" + source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.8.1" cluster_name = local.cluster_name cluster_version = "1.23" @@ -62,7 +62,7 @@ module "eks_blueprints" { } module "eks_blueprints_kubernetes_addons" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.8.1" eks_cluster_id = module.eks_blueprints.eks_cluster_id eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint diff --git a/examples/existing-cluster-with-base-and-infra/README.md b/examples/existing-cluster-with-base-and-infra/README.md index 3937ae8..e3bef6e 100644 --- a/examples/existing-cluster-with-base-and-infra/README.md +++ b/examples/existing-cluster-with-base-and-infra/README.md @@ -134,7 +134,6 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws | [terraform](#requirement\_terraform) | >= 1.0.0 | | [aws](#requirement\_aws) | >= 4.0.0 | | [grafana](#requirement\_grafana) | >= 1.25.0 | -| [grafana](#requirement\_grafana) | >= 1.25.0 | | [helm](#requirement\_helm) | >= 2.4.1 | | [kubectl](#requirement\_kubectl) | >= 1.14 | | [kubernetes](#requirement\_kubernetes) | >= 2.10 | diff --git a/examples/existing-cluster-with-base-and-infra/terraform.tfvars b/examples/existing-cluster-with-base-and-infra/terraform.tfvars index 4c908f1..987a78c 100644 --- a/examples/existing-cluster-with-base-and-infra/terraform.tfvars +++ b/examples/existing-cluster-with-base-and-infra/terraform.tfvars @@ -11,4 +11,4 @@ managed_prometheus_workspace_id = "" managed_grafana_workspace_id = "" # (mandatory) Grafana API Key - https://docs.aws.amazon.com/grafana/latest/userguide/API_key_console.html -grafana_api_key = "" \ No newline at end of file +grafana_api_key = "" diff --git a/modules/add-ons/adot-operator/README.md b/modules/add-ons/adot-operator/README.md index bc7131f..bc6e31f 100644 --- a/modules/add-ons/adot-operator/README.md +++ b/modules/add-ons/adot-operator/README.md @@ -41,7 +41,7 @@ the ADOT Operator. | Name | Source | Version | |------|--------|---------| -| [cert\_manager](#module\_cert\_manager) | github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/cert-manager | n/a | +| [cert\_manager](#module\_cert\_manager) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager | v4.8.1 | ## Resources diff --git a/modules/workloads/infra/README.md b/modules/workloads/infra/README.md index 262ca15..7fd0282 100644 --- a/modules/workloads/infra/README.md +++ b/modules/workloads/infra/README.md @@ -32,7 +32,7 @@ This module is inspired from the open source [kube-prometheus-stack](https://git | Name | Source | Version | |------|--------|---------| -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon | n/a | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.8.1 | ## Resources @@ -41,16 +41,9 @@ This module is inspired from the open source [kube-prometheus-stack](https://git | [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 | | [grafana_dashboard.cluster](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | -| [grafana_dashboard.clusternw](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | | [grafana_dashboard.kubelet](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | | [grafana_dashboard.nodes](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | -| [grafana_dashboard.nsnw](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | -| [grafana_dashboard.nsnwworkload](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | -| [grafana_dashboard.nspods](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | | [grafana_dashboard.nsworkload](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | -| [grafana_dashboard.nwworload](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | -| [grafana_dashboard.podnetwork](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | -| [grafana_dashboard.pods](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | | [grafana_dashboard.workloads](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource | | [helm_release.kube_state_metrics](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | | [helm_release.prometheus_node_exporter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | diff --git a/modules/workloads/infra/dashboards/cluster.json b/modules/workloads/infra/dashboards/cluster.json index bb37473..62268db 100644 --- a/modules/workloads/infra/dashboards/cluster.json +++ b/modules/workloads/infra/dashboards/cluster.json @@ -2873,4 +2873,4 @@ "uid": "efa86fd1d0c121a26444b636a3f509a8", "version": 9, "weekStart": "" -} \ No newline at end of file +} diff --git a/modules/workloads/infra/dashboards/namespace-workloads.json b/modules/workloads/infra/dashboards/namespace-workloads.json index e8cb8f0..e127d9f 100644 --- a/modules/workloads/infra/dashboards/namespace-workloads.json +++ b/modules/workloads/infra/dashboards/namespace-workloads.json @@ -2274,4 +2274,4 @@ "uid": "a87fb0d919ec0ea5f6543124e16c42a5", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/modules/workloads/infra/dashboards/nodes.json b/modules/workloads/infra/dashboards/nodes.json index aa543ee..1d7fcb0 100644 --- a/modules/workloads/infra/dashboards/nodes.json +++ b/modules/workloads/infra/dashboards/nodes.json @@ -1294,4 +1294,4 @@ "title": "Kubernetes / Compute Resources / Node (Pods)", "uid": "200ac8fdbfbb74b39aff88118e4d1c2c", "weekStart": "" -} \ No newline at end of file +} diff --git a/modules/workloads/infra/main.tf b/modules/workloads/infra/main.tf index 925e10a..b5dbb49 100644 --- a/modules/workloads/infra/main.tf +++ b/modules/workloads/infra/main.tf @@ -35,7 +35,7 @@ resource "helm_release" "prometheus_node_exporter" { } module "helm_addon" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.8.1" helm_config = merge( { diff --git a/modules/workloads/nginx/README.md b/modules/workloads/nginx/README.md index 04df389..df683c6 100644 --- a/modules/workloads/nginx/README.md +++ b/modules/workloads/nginx/README.md @@ -26,7 +26,7 @@ It provides the following resources: | Name | Source | Version | |------|--------|---------| -| [helm\_addon](#module\_helm\_addon) | ../helm-addon | n/a | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon | n/a | ## Resources diff --git a/outputs.tf b/outputs.tf index a969724..87d61a5 100644 --- a/outputs.tf +++ b/outputs.tf @@ -4,7 +4,7 @@ output "eks_cluster_id" { } output "aws_region" { - description = "EKS Cluster Id" + description = "AWS Region" value = var.aws_region }