storytold/terraform-aws-observability-accelerator
2
0
Fork 0
mirror of https://github.com/storytold/terraform-aws-observability-accelerator.git synced 2026-10-09 00:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies (#167)

Browse Source 
* Lint file

* Update dependencies

* Update badges

* Bump terraform versions

* Temp allow run on current branch

* Run tests on push
This commit is contained in:
Rodrigue Koffi
2023-06-01 08:55:35 +00:00
committed by GitHub
parent 850ce8075f
commit 0c4407638a
13 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/plan-examples.yml
-6
View File
@@ -1,14 +1,8 @@
name: plan-examples name: plan-examples
on: 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 # this will allow to run test on main and not modify the status badge when opening a PR
push: push:
branches: ["main"]
workflow_dispatch: workflow_dispatch:
concurrency: concurrency:
README.md
+2 -2
View File
@@ -1,7 +1,7 @@
# AWS Observability Accelerator for Terraform # 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) [![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)](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/plan-examples.yml) [![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! Welcome to the AWS Observability Accelerator for Terraform!
docs/helpers/new-eks-cluster.md
-3
View File
@@ -1,8 +1,5 @@
# Creating a new Amazon EKS cluster with VPC # 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: This example deploys the following:
- New sample VPC, 3 Private Subnets and 3 Public Subnets - New sample VPC, 3 Private Subnets and 3 Public Subnets
examples/eks-cluster-with-vpc/main.tf
+3 -3
View File
@@ -41,7 +41,7 @@ locals {
#--------------------------------------------------------------- #---------------------------------------------------------------
module "eks_blueprints" { 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_name = local.cluster_name
cluster_version = var.eks_version cluster_version = var.eks_version
@@ -62,7 +62,7 @@ module "eks_blueprints" {
} }
module "eks_blueprints_kubernetes_addons" { 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_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
@@ -84,7 +84,7 @@ module "eks_blueprints_kubernetes_addons" {
module "vpc" { module "vpc" {
source = "terraform-aws-modules/vpc/aws" source = "terraform-aws-modules/vpc/aws"
version = "~> 3.0" version = "~> 5.0"
name = local.name name = local.name
cidr = local.vpc_cidr cidr = local.vpc_cidr
examples/eks-cluster-with-vpc/versions.tf
+5 -5
View File
@@ -1,14 +1,14 @@
terraform { terraform {
required_version = ">= 1.1.0" required_version = ">= 1.3.0"
required_providers { required_providers {
aws = { aws = {
source = "hashicorp/aws" source = "hashicorp/aws"
version = ">= 4.0.0" version = ">= 5.0.0"
} }
kubernetes = { kubernetes = {
source = "hashicorp/kubernetes" source = "hashicorp/kubernetes"
version = ">= 2.10" version = ">= 2.20"
} }
kubectl = { kubectl = {
source = "gavinbunney/kubectl" source = "gavinbunney/kubectl"
@@ -16,11 +16,11 @@ terraform {
} }
helm = { helm = {
source = "hashicorp/helm" source = "hashicorp/helm"
version = ">= 2.4.1" version = ">= 2.10.0"
} }
grafana = { grafana = {
source = "grafana/grafana" source = "grafana/grafana"
version = ">= 1.25.0" version = ">= 1.40.1"
} }
} }
modules/eks-monitoring/README.md
+1 -1
View File
@@ -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_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_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_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_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 | | <a name="module_operator"></a> [operator](#module\_operator) | ./add-ons/adot-operator | n/a |
modules/eks-monitoring/add-ons/adot-operator/README.md
+1 -1
View File
@@ -41,7 +41,7 @@ the ADOT Operator.
| Name | Source | Version | | 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 ## Resources
modules/eks-monitoring/add-ons/adot-operator/main.tf
+8 -7
View File
@@ -1,5 +1,5 @@
module "cert_manager" { 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 count = var.enable_cert_manager ? 1 : 0
helm_config = var.helm_config helm_config = var.helm_config
@@ -26,12 +26,13 @@ data "aws_eks_addon_version" "this" {
} }
resource "aws_eks_addon" "adot" { resource "aws_eks_addon" "adot" {
cluster_name = var.addon_context.eks_cluster_id cluster_name = var.addon_context.eks_cluster_id
addon_name = local.name addon_name = local.name
addon_version = try(var.addon_config.addon_version, data.aws_eks_addon_version.this.version) addon_version = try(var.addon_config.addon_version, data.aws_eks_addon_version.this.version)
resolve_conflicts = try(var.addon_config.resolve_conflicts, "OVERWRITE") resolve_conflicts_on_create = try(var.addon_config.resolve_conflicts, "OVERWRITE")
service_account_role_arn = try(var.addon_config.service_account_role_arn, null) resolve_conflicts_on_update = try(var.addon_config.resolve_conflicts, "OVERWRITE")
preserve = try(var.addon_config.preserve, true) service_account_role_arn = try(var.addon_config.service_account_role_arn, null)
preserve = try(var.addon_config.preserve, true)
tags = merge( tags = merge(
var.addon_context.tags, var.addon_context.tags,
modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md
+1 -1
View File
@@ -24,7 +24,7 @@ See this [Helm Chart](https://github.com/aws/eks-charts/tree/master/stable/aws-f
| Name | Source | Version | | 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 ## Resources
modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf
+1 -1
View File
@@ -1,5 +1,5 @@
module "helm_addon" { 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 manage_via_gitops = var.manage_via_gitops
set_values = local.set_values set_values = local.set_values
helm_config = local.helm_config helm_config = local.helm_config
modules/eks-monitoring/add-ons/external-secrets/README.md
+2 -2
View File
@@ -23,8 +23,8 @@ This deploys an EKS Cluster with the External Secrets Operator. The cluster is p
| Name | Source | Version | | Name | Source | Version |
|------|--------|---------| |------|--------|---------|
| <a name="module_cluster_secretstore_role"></a> [cluster\_secretstore\_role](#module\_cluster\_secretstore\_role) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa | v4.28.0 | | <a name="module_cluster_secretstore_role"></a> [cluster\_secretstore\_role](#module\_cluster\_secretstore\_role) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa | v4.32.0 |
| <a name="module_external_secrets"></a> [external\_secrets](#module\_external\_secrets) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets | v4.28.0 | | <a name="module_external_secrets"></a> [external\_secrets](#module\_external\_secrets) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets | v4.32.0 |
## Resources ## Resources
modules/eks-monitoring/add-ons/external-secrets/main.tf
+2 -2
View File
@@ -1,5 +1,5 @@
module "external_secrets" { 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 count = var.enable_external_secrets ? 1 : 0
helm_config = var.helm_config helm_config = var.helm_config
@@ -17,7 +17,7 @@ resource "aws_kms_key" "secrets" {
} }
module "cluster_secretstore_role" { 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 kubernetes_namespace = local.namespace
create_kubernetes_namespace = false create_kubernetes_namespace = false
kubernetes_service_account = local.cluster_secretstore_sa kubernetes_service_account = local.cluster_secretstore_sa
modules/eks-monitoring/main.tf
+1 -1
View File
@@ -72,7 +72,7 @@ resource "helm_release" "grafana_operator" {
} }
module "helm_addon" { 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( helm_config = merge(
{ {