Skip to content

Commit

Permalink
update to new version
Browse files Browse the repository at this point in the history
  • Loading branch information
atquintegro committed May 17, 2024
1 parent a647fa2 commit 20b291b
Show file tree
Hide file tree
Showing 20 changed files with 44 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
repos:
- repo: https:/antonbabenko/pre-commit-terraform
rev: v1.76.0
rev: v1.89.1
hooks:
- id: terraform_fmt
- id: terraform_docs
- id: terragrunt_fmt
# - id: terraform_tflint
# - id: terraform_tfsec
- repo: https:/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.6.0
hooks:
- id: check-merge-conflict
- id: trailing-whitespace
Expand Down
2 changes: 1 addition & 1 deletion terraform/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.3
1.8.3
2 changes: 1 addition & 1 deletion terraform/modules/aws-acm/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ data "aws_acm_certificate" "main" {

module "acm" {
source = "terraform-aws-modules/acm/aws"
version = "4.3.2"
version = "5.0.1"

create_certificate = var.create_acm_certificate

Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/aws-cis-benchmark-alerts/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module "eventbridge" {
count = var.aws_cis_benchmark_alerts.enabled ? 1 : 0
source = "terraform-aws-modules/eventbridge/aws"
version = "1.17.3"
version = "3.3.1"

create_bus = false

Expand Down
8 changes: 4 additions & 4 deletions terraform/modules/aws-eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ data "aws_ami" "eks_default_arm64" {
#tfsec:ignore:aws-vpc-no-public-egress-sgr tfsec:ignore:aws-eks-enable-control-plane-logging tfsec:ignore:aws-eks-encrypt-secrets tfsec:ignore:aws-eks-no-public-cluster-access tfsec:ignore:aws-eks-no-public-cluster-access-to-cidr
module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "20.8.4"
version = "20.10.0"

cluster_name = var.name
cluster_version = var.eks_cluster_version
Expand Down Expand Up @@ -112,8 +112,8 @@ module "eks" {
}

module "vpc_cni_irsa" {
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "5.17.0"
source = "terraform-aws-modules/iam/aws/modules/iam-role-for-service-accounts-eks"
version = "5.39.1"

role_name = "${var.name}-vpc-cni"
attach_vpc_cni_policy = true
Expand All @@ -131,7 +131,7 @@ module "vpc_cni_irsa" {

module "aws_ebs_csi_driver" {
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "5.17.0"
version = "5.39.1"

role_name = "${var.name}-aws-ebs-csi-driver"
attach_ebs_csi_policy = true
Expand Down
6 changes: 3 additions & 3 deletions terraform/modules/aws-pritunl/iam.tf
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ data "aws_iam_policy_document" "this" {

module "iam_policy" {
source = "terraform-aws-modules/iam/aws//modules/iam-policy"
version = "4.14.0"
version = "5.39.1"

name = var.name
path = "/"
Expand All @@ -67,7 +67,7 @@ module "iam_policy" {

module "this_role" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role"
version = "4.14.0"
version = "5.39.1"

trusted_role_services = [
"ec2.amazonaws.com"
Expand All @@ -91,7 +91,7 @@ resource "aws_iam_instance_profile" "this_instance_profile" {

module "backup_role" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role"
version = "4.14.0"
version = "5.39.1"

trusted_role_services = [
"backup.amazonaws.com"
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/aws-pritunl/security_groups.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "ec2_sg" {
source = "terraform-aws-modules/security-group/aws"
version = "4.8.0"
version = "5.1.2"

name = var.name
description = "${var.name} security group"
Expand Down
4 changes: 2 additions & 2 deletions terraform/modules/aws-r53/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ data "aws_route53_zone" "main" {
}

module "r53_zone" {
source = "terraform-aws-modules/route53/aws//modules/zones"
version = "2.10.2"
source = "terraform-aws-modules/route53/aws/modules/zones"
version = "2.11.1"

create = var.create_r53_zone

Expand Down
4 changes: 2 additions & 2 deletions terraform/modules/aws-vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ locals {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "5.7.1"
version = "5.8.1"

name = var.name
cidr = var.cidr
Expand Down Expand Up @@ -84,7 +84,7 @@ module "vpc" {

module "vpc_gateway_endpoints" {
source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
version = "5.7.1"
version = "5.8.1"

vpc_id = module.vpc.vpc_id

Expand Down
28 changes: 14 additions & 14 deletions terraform/modules/k8s-addons/helm-releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ releases:
enabled: true
chart: aws-load-balancer-controller
repository: https://aws.github.io/eks-charts
chart_version: 1.5.1
chart_version: 1.7.2
namespace: aws-load-balancer-controller
- id: cert-manager
enabled: false
chart: cert-manager
repository: https://charts.jetstack.io
chart_version: 1.11.0
chart_version: 1.14.5
namespace: certmanager
- id: cert-mananger-certificate
enabled: false
Expand All @@ -33,71 +33,71 @@ releases:
enabled: false
chart: external-dns
repository: https://kubernetes-sigs.github.io/external-dns
chart_version: 1.9.0
chart_version: 1.14.4
namespace: external-dns
- id: external-secrets
enabled: true
chart: external-secrets
repository: https://charts.external-secrets.io
chart_version: 0.8.1
chart_version: 0.9.18
namespace: external-secrets
- id: gitlab-runner
enabled: false
chart: gitlab-runner
repository: https://charts.gitlab.io
chart_version: 0.51.1
chart_version: 0.64.1
namespace: gitlab-runner
- id: ingress-nginx
enabled: true
chart: ingress-nginx
repository: https://kubernetes.github.io/ingress-nginx
chart_version: 4.6.0
chart_version: 4.10.1
namespace: ingress-nginx
- id: istio
enabled: false
chart:
repository: https://istio-release.storage.googleapis.com/charts
chart_version: 1.17.2
chart_version: 1.22.0
namespace: istio-system
- id: karpenter
enabled: true
chart: karpenter
repository: oci://public.ecr.aws/karpenter
chart_version: v0.33.0
chart_version: v0.36.1
namespace: karpenter
- id: keda
enabled: false
chart: keda
repository: https://kedacore.github.io/charts
chart_version: 2.10.2
chart_version: 2.14.2
namespace: keda
- id: kiali
enabled: false
chart: kiali-server
repository: https://kiali.org/helm-charts
chart_version: 1.66.0
chart_version: 1.84.0
namespace: kiali
- id: kube-prometheus-stack
enabled: true
chart: kube-prometheus-stack
repository: https://prometheus-community.github.io/helm-charts
chart_version: 45.11.0
chart_version: 58.5.3
namespace: monitoring
- id: loki-stack
enabled: true
chart: loki-stack
repository: https://grafana.github.io/helm-charts
chart_version: 2.9.10
chart_version: 2.10.2
namespace: loki
- id: reloader
enabled: true
chart: reloader
repository: https://stakater.github.io/stakater-charts
chart_version: 1.0.22
chart_version: 1.0.97
namespace: reloader
- id: victoria-metrics-k8s-stack
enabled: false
chart: victoria-metrics-k8s-stack
repository: https://victoriametrics.github.io/helm-charts
chart_version: 0.14.17
chart_version: 0.22.11
namespace: monitoring
2 changes: 1 addition & 1 deletion terragrunt/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.3
1.8.3
2 changes: 1 addition & 1 deletion terragrunt/.terragrunt-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.56.5
0.58.5
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ generate "providers_versions" {
if_exists = "overwrite"
contents = <<EOF
terraform {
required_version = ">= 1.7.0"
required_version = ">= 1.8.3"
required_providers {
aws = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ generate "providers_versions" {
if_exists = "overwrite"
contents = <<EOF
terraform {
required_version = ">= 1.7.0"
required_version = ">= 1.8.3"
required_providers {
aws = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ generate "providers_versions" {
if_exists = "overwrite"
contents = <<EOF
terraform {
required_version = ">= 1.7.0"
required_version = ">= 1.8.3"
required_providers {
aws = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ generate "providers_versions" {
if_exists = "overwrite"
contents = <<EOF
terraform {
required_version = ">= 1.7.0"
required_version = ">= 1.8.3"
required_providers {
aws = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ generate "providers_versions" {
if_exists = "overwrite"
contents = <<EOF
terraform {
required_version = ">= 1.7.0"
required_version = ">= 1.8.3"
required_providers {
aws = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ generate "providers_versions" {
if_exists = "overwrite"
contents = <<EOF
terraform {
required_version = ">= 1.7.0"
required_version = ">= 1.8.3"
required_providers {
aws = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ generate "providers_versions" {
if_exists = "overwrite"
contents = <<EOF
terraform {
required_version = ">= 1.7.0"
required_version = ">= 1.8.3"
required_providers {
aws = {
Expand Down
8 changes: 4 additions & 4 deletions terragrunt/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
terragrunt_version_constraint = ">= 0.39"
terragrunt_version_constraint = ">= 0.58"
skip = true

locals {
remote_state_bucket_region = "us-east-1" #get_env("TF_REMOTE_STATE_BUCKET_REGION")
remote_state_bucket = "maddevs-netpol-use1-tfstate" #get_env("TF_REMOTE_STATE_BUCKET")

tf_providers = {
aws = "5.45.0"
kubernetes = "2.29.0"
aws = "5.49.0"
kubernetes = "2.30.0"
kubectl = "1.14.0"
helm = "2.13.0"
helm = "2.13.2"
http = "3.4.2"
}
}
Expand Down

0 comments on commit 20b291b

Please sign in to comment.