Update dependencies (#167)

* Lint file

* Update dependencies

* Update badges

* Bump terraform versions

* Temp allow run on current branch

* Run tests on push

Author: bonclay7

.github/workflows/plan-examples.yml

@@ -1,14 +1,8 @@
 name: plan-examples
 
 on:
-  # Review https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ and better understand the risks of using pull_request_target before making major changes to this workflow.
-  pull_request_target:
-    branches:
-      - main
   # this will allow to run test on main and not modify the status badge when opening a PR
   push:
-    branches: ["main"]
-    
   workflow_dispatch:
 
 concurrency:

README.md

@@ -1,7 +1,7 @@
 # AWS Observability Accelerator for Terraform
 
-[![pre-commit](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/pre-commit.yaml/badge.svg)](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/pre-commit.yaml)
-[![plan-examples](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/plan-examples.yml/badge.svg)](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/plan-examples.yml)
+[![pre-commit](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/pre-commit.yaml/badge.svg?branch=main)](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/pre-commit.yaml)
+[![plan-examples](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/plan-examples.yml/badge.svg?branch=main)](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/plan-examples.yml)
 
 Welcome to the AWS Observability Accelerator for Terraform!
 

docs/helpers/new-eks-cluster.md

@@ -1,8 +1,5 @@
 # Creating a new Amazon EKS cluster with VPC
 
-!!! note
-    This example is a subset from [this EKS Blueprint example](https://github.com/aws-ia/terraform-aws-eks-blueprints/tree/v4.13.1/examples/eks-cluster-with-new-vpc)
-
 This example deploys the following:
 
 - New sample VPC, 3 Private Subnets and 3 Public Subnets

examples/eks-cluster-with-vpc/main.tf

@@ -41,7 +41,7 @@ locals {
 #---------------------------------------------------------------
 
 module "eks_blueprints" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.27.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.32.0"
 
   cluster_name    = local.cluster_name
   cluster_version = var.eks_version
@@ -62,7 +62,7 @@ module "eks_blueprints" {
 }
 
 module "eks_blueprints_kubernetes_addons" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.27.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.32.0"
 
   eks_cluster_id       = module.eks_blueprints.eks_cluster_id
   eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
@@ -84,7 +84,7 @@ module "eks_blueprints_kubernetes_addons" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 3.0"
+  version = "~> 5.0"
 
   name = local.name
   cidr = local.vpc_cidr

examples/eks-cluster-with-vpc/versions.tf

@@ -1,26 +1,26 @@
 terraform {
-  required_version = ">= 1.1.0"
+  required_version = ">= 1.3.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.0.0"
+      version = ">= 5.0.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = ">= 2.10"
+      version = ">= 2.20"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"
       version = ">= 1.14"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = ">= 2.4.1"
+      version = ">= 2.10.0"
     }
     grafana = {
       source  = "grafana/grafana"
-      version = ">= 1.25.0"
+      version = ">= 1.40.1"
     }
   }
 

modules/eks-monitoring/README.md

@@ -38,7 +38,7 @@ This module makes use of the open source [kube-prometheus-stack](https://github.
 |------|--------|---------|
 | <a name="module_external_secrets"></a> [external\_secrets](#module\_external\_secrets) | ./add-ons/external-secrets | n/a |
 | <a name="module_fluentbit_logs"></a> [fluentbit\_logs](#module\_fluentbit\_logs) | ./add-ons/aws-for-fluentbit | n/a |
-| <a name="module_helm_addon"></a> [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.26.0 |
+| <a name="module_helm_addon"></a> [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.0 |
 | <a name="module_java_monitoring"></a> [java\_monitoring](#module\_java\_monitoring) | ./patterns/java | n/a |
 | <a name="module_nginx_monitoring"></a> [nginx\_monitoring](#module\_nginx\_monitoring) | ./patterns/nginx | n/a |
 | <a name="module_operator"></a> [operator](#module\_operator) | ./add-ons/adot-operator | n/a |

modules/eks-monitoring/add-ons/adot-operator/README.md

@@ -41,7 +41,7 @@ the ADOT Operator.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_cert_manager"></a> [cert\_manager](#module\_cert\_manager) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager | v4.13.1 |
+| <a name="module_cert_manager"></a> [cert\_manager](#module\_cert\_manager) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager | v4.32.0 |
 
 ## Resources
 

modules/eks-monitoring/add-ons/adot-operator/main.tf

@@ -1,5 +1,5 @@
 module "cert_manager" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager?ref=v4.13.1"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager?ref=v4.32.0"
   count  = var.enable_cert_manager ? 1 : 0
 
   helm_config   = var.helm_config
@@ -26,12 +26,13 @@ data "aws_eks_addon_version" "this" {
 }
 
 resource "aws_eks_addon" "adot" {
-  cluster_name             = var.addon_context.eks_cluster_id
-  addon_name               = local.name
-  addon_version            = try(var.addon_config.addon_version, data.aws_eks_addon_version.this.version)
-  resolve_conflicts        = try(var.addon_config.resolve_conflicts, "OVERWRITE")
-  service_account_role_arn = try(var.addon_config.service_account_role_arn, null)
-  preserve                 = try(var.addon_config.preserve, true)
+  cluster_name                = var.addon_context.eks_cluster_id
+  addon_name                  = local.name
+  addon_version               = try(var.addon_config.addon_version, data.aws_eks_addon_version.this.version)
+  resolve_conflicts_on_create = try(var.addon_config.resolve_conflicts, "OVERWRITE")
+  resolve_conflicts_on_update = try(var.addon_config.resolve_conflicts, "OVERWRITE")
+  service_account_role_arn    = try(var.addon_config.service_account_role_arn, null)
+  preserve                    = try(var.addon_config.preserve, true)
 
   tags = merge(
     var.addon_context.tags,

modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md

@@ -24,7 +24,7 @@ See this [Helm Chart](https://github.com/aws/eks-charts/tree/master/stable/aws-f
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_helm_addon"></a> [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.26.0 |
+| <a name="module_helm_addon"></a> [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.0 |
 
 ## Resources
 

modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf

@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.26.0"
+  source            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.0"
   manage_via_gitops = var.manage_via_gitops
   set_values        = local.set_values
   helm_config       = local.helm_config