From 0c4407638a1d1df8a9271726cbb2523c10b9d855 Mon Sep 17 00:00:00 2001 From: Rodrigue Koffi Date: Thu, 1 Jun 2023 08:55:35 +0000 Subject: [PATCH] Update dependencies (#167) * Lint file * Update dependencies * Update badges * Bump terraform versions * Temp allow run on current branch * Run tests on push --- .github/workflows/plan-examples.yml | 6 ------ README.md | 4 ++-- docs/helpers/new-eks-cluster.md | 3 --- examples/eks-cluster-with-vpc/main.tf | 6 +++--- examples/eks-cluster-with-vpc/versions.tf | 10 +++++----- modules/eks-monitoring/README.md | 2 +- .../add-ons/adot-operator/README.md | 2 +- .../eks-monitoring/add-ons/adot-operator/main.tf | 15 ++++++++------- .../add-ons/aws-for-fluentbit/README.md | 2 +- .../add-ons/aws-for-fluentbit/main.tf | 2 +- .../add-ons/external-secrets/README.md | 4 ++-- .../add-ons/external-secrets/main.tf | 4 ++-- modules/eks-monitoring/main.tf | 2 +- 13 files changed, 27 insertions(+), 35 deletions(-) diff --git a/.github/workflows/plan-examples.yml b/.github/workflows/plan-examples.yml index e876fbf..454e252 100644 --- a/.github/workflows/plan-examples.yml +++ b/.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: diff --git a/README.md b/README.md index 6e8228d..96b1e9e 100644 --- a/README.md +++ b/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! diff --git a/docs/helpers/new-eks-cluster.md b/docs/helpers/new-eks-cluster.md index 02cf285..2849e72 100644 --- a/docs/helpers/new-eks-cluster.md +++ b/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 diff --git a/examples/eks-cluster-with-vpc/main.tf b/examples/eks-cluster-with-vpc/main.tf index f64f5d7..c9fe84e 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?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 diff --git a/examples/eks-cluster-with-vpc/versions.tf b/examples/eks-cluster-with-vpc/versions.tf index 2599da1..fef34d8 100644 --- a/examples/eks-cluster-with-vpc/versions.tf +++ b/examples/eks-cluster-with-vpc/versions.tf @@ -1,14 +1,14 @@ 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" @@ -16,11 +16,11 @@ terraform { } helm = { source = "hashicorp/helm" - version = ">= 2.4.1" + version = ">= 2.10.0" } grafana = { source = "grafana/grafana" - version = ">= 1.25.0" + version = ">= 1.40.1" } } diff --git a/modules/eks-monitoring/README.md b/modules/eks-monitoring/README.md index 781825f..6168448 100644 --- a/modules/eks-monitoring/README.md +++ b/modules/eks-monitoring/README.md @@ -38,7 +38,7 @@ This module makes use of the open source [kube-prometheus-stack](https://github. |------|--------|---------| | [external\_secrets](#module\_external\_secrets) | ./add-ons/external-secrets | n/a | | [fluentbit\_logs](#module\_fluentbit\_logs) | ./add-ons/aws-for-fluentbit | n/a | -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.26.0 | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.0 | | [java\_monitoring](#module\_java\_monitoring) | ./patterns/java | n/a | | [nginx\_monitoring](#module\_nginx\_monitoring) | ./patterns/nginx | n/a | | [operator](#module\_operator) | ./add-ons/adot-operator | n/a | diff --git a/modules/eks-monitoring/add-ons/adot-operator/README.md b/modules/eks-monitoring/add-ons/adot-operator/README.md index 39fd936..f7e6aa4 100644 --- a/modules/eks-monitoring/add-ons/adot-operator/README.md +++ b/modules/eks-monitoring/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 | v4.13.1 | +| [cert\_manager](#module\_cert\_manager) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager | v4.32.0 | ## Resources diff --git a/modules/eks-monitoring/add-ons/adot-operator/main.tf b/modules/eks-monitoring/add-ons/adot-operator/main.tf index 95a8215..3a68306 100644 --- a/modules/eks-monitoring/add-ons/adot-operator/main.tf +++ b/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, diff --git a/modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md b/modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md index 8a5b846..e3ef1a6 100644 --- a/modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md +++ b/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 | |------|--------|---------| -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.26.0 | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.0 | ## Resources diff --git a/modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf b/modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf index e93fcec..e0a0dea 100644 --- a/modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf +++ b/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 diff --git a/modules/eks-monitoring/add-ons/external-secrets/README.md b/modules/eks-monitoring/add-ons/external-secrets/README.md index 248c2e5..8d13e60 100644 --- a/modules/eks-monitoring/add-ons/external-secrets/README.md +++ b/modules/eks-monitoring/add-ons/external-secrets/README.md @@ -23,8 +23,8 @@ This deploys an EKS Cluster with the External Secrets Operator. The cluster is p | Name | Source | Version | |------|--------|---------| -| [cluster\_secretstore\_role](#module\_cluster\_secretstore\_role) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa | v4.28.0 | -| [external\_secrets](#module\_external\_secrets) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets | v4.28.0 | +| [cluster\_secretstore\_role](#module\_cluster\_secretstore\_role) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa | v4.32.0 | +| [external\_secrets](#module\_external\_secrets) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets | v4.32.0 | ## Resources diff --git a/modules/eks-monitoring/add-ons/external-secrets/main.tf b/modules/eks-monitoring/add-ons/external-secrets/main.tf index ef6ecae..8633d7b 100644 --- a/modules/eks-monitoring/add-ons/external-secrets/main.tf +++ b/modules/eks-monitoring/add-ons/external-secrets/main.tf @@ -1,5 +1,5 @@ module "external_secrets" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets?ref=v4.28.0" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets?ref=v4.32.0" count = var.enable_external_secrets ? 1 : 0 helm_config = var.helm_config @@ -17,7 +17,7 @@ resource "aws_kms_key" "secrets" { } module "cluster_secretstore_role" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.32.0" kubernetes_namespace = local.namespace create_kubernetes_namespace = false kubernetes_service_account = local.cluster_secretstore_sa diff --git a/modules/eks-monitoring/main.tf b/modules/eks-monitoring/main.tf index a88158c..91509fe 100644 --- a/modules/eks-monitoring/main.tf +++ b/modules/eks-monitoring/main.tf @@ -72,7 +72,7 @@ resource "helm_release" "grafana_operator" { } 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" helm_config = merge( {