Skip to content

Commit

Permalink
Merge branch 'main' into feature/gp3-disk
Browse files Browse the repository at this point in the history
  • Loading branch information
leiicamundi committed Jul 17, 2024
2 parents dba6ecc + ce72323 commit a2948da
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ repos:
- id: actionlint-docker

- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 37.421.3
rev: 37.432.0
hooks:
- id: renovate-config-validator
args: ["--strict"]

- repo: https://github.com/compilerla/conventional-pre-commit
rev: v3.2.0 # use tags until renovate supports sha: https://github.com/renovatebot/renovate/issues/22567
rev: v3.3.0 # use tags until renovate supports sha: https://github.com/renovatebot/renovate/issues/22567
hooks:
- id: conventional-pre-commit
stages: [commit-msg]
Expand Down
6 changes: 3 additions & 3 deletions .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
awscli 2.17.13

# renovate: datasource=github-tags depName=eksctl-io/eksctl
eksctl 0.183.0
eksctl 0.187.0

golang 1.22.5

just 1.29.1
just 1.31.0

opentofu 1.7.3

Expand All @@ -30,6 +30,6 @@ terraform 1.9.2

terraform-docs 0.18.0

tflint 0.51.2
tflint 0.52.0

tfsec 1.28.10
10 changes: 5 additions & 5 deletions modules/eks-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ module "eks_cluster" {

| Name | Source | Version |
|------|--------|---------|
| <a name="module_cert_manager_role"></a> [cert\_manager\_role](#module\_cert\_manager\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.39.1 |
| <a name="module_ebs_cs_role"></a> [ebs\_cs\_role](#module\_ebs\_cs\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.39.1 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 20.15.0 |
| <a name="module_external_dns_role"></a> [external\_dns\_role](#module\_external\_dns\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.39.1 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.8.1 |
| <a name="module_cert_manager_role"></a> [cert\_manager\_role](#module\_cert\_manager\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.41.0 |
| <a name="module_ebs_cs_role"></a> [ebs\_cs\_role](#module\_ebs\_cs\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.41.0 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 20.19.0 |
| <a name="module_external_dns_role"></a> [external\_dns\_role](#module\_external\_dns\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.41.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.9.0 |
## Resources

| Name | Type |
Expand Down
2 changes: 1 addition & 1 deletion modules/eks-cluster/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# https://github.com/terraform-aws-modules/terraform-aws-eks
module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "20.15.0"
version = "20.19.0"

cluster_name = var.name
cluster_version = var.kubernetes_version
Expand Down
6 changes: 3 additions & 3 deletions modules/eks-cluster/iam.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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

role_name = "${var.name}-ebs-cs-role"

Expand All @@ -25,7 +25,7 @@ module "ebs_cs_role" {
# Following role allows cert-manager to do the DNS01 challenge
module "cert_manager_role" {
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "5.39.1"
version = "5.41.0"

role_name = "${var.name}-cert-manager-role"

Expand All @@ -44,7 +44,7 @@ module "cert_manager_role" {
# Following role allows external-dns to adjust values in hosted zones
module "external_dns_role" {
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
version = "5.39.1"
version = "5.41.0"

role_name = "${var.name}-external-dns-role"

Expand Down
2 changes: 1 addition & 1 deletion modules/eks-cluster/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ locals {

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

name = local.vpc_name
# requires a /16 range, resulting in 2 leftover subnets, which can be used for DBs
Expand Down
2 changes: 1 addition & 1 deletion test/src/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/kms v1.35.3
github.com/aws/aws-sdk-go-v2/service/rds v1.81.4
github.com/aws/smithy-go v1.20.3
github.com/gruntwork-io/terratest v0.46.16
github.com/gruntwork-io/terratest v0.47.0
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.27.0
k8s.io/api v0.30.2
Expand Down
2 changes: 2 additions & 0 deletions test/src/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,8 @@ github.com/gruntwork-io/terratest v0.46.15 h1:qfqjTFveymaqe7aAWn3LjlK0SwVGpRfoOu
github.com/gruntwork-io/terratest v0.46.15/go.mod h1:9bd22zAojjBBiYdsp+AR1iyl2iB6bRUVm2Yf1AFhfrA=
github.com/gruntwork-io/terratest v0.46.16 h1:l+HHuU7lNLwoAl2sP8zkYJy0uoE2Mwha2nw+rim+OhQ=
github.com/gruntwork-io/terratest v0.46.16/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM=
github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c=
github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
Expand Down

0 comments on commit a2948da

Please sign in to comment.