Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for TF before 1.0 #26

Merged
merged 7 commits into from
Jun 8, 2023
Merged

Drop support for TF before 1.0 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf4f31c
Drop support for TF before 1.0
snovikov Jun 7, 2023
6fff941
Update Makefile
snovikov Jun 7, 2023
97896ff
Fix release-drafter permissions
snovikov Jun 7, 2023
19c5455
Update sg modules
snovikov Jun 7, 2023
4ce0e50
Update sg modules
snovikov Jun 7, 2023
40a115a
Update examples
snovikov Jun 7, 2023
9837a4e
Fix AMI filter
snovikov Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/release-drafter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ on:
branches:
- master

permissions:
contents: read

jobs:
update_release_draft:
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v5
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ TF_MODULES = $(sort $(dir $(wildcard $(CURRENT_DIR)modules/*/)))
# Container versions
# -------------------------------------------------------------------------------------------------
TF_VERSION = 1.0.11
TFDOCS_VERSION = 0.16.0-0.31
FL_VERSION = 0.4
JL_VERSION = 1.6.0-0.5
TFDOCS_VERSION = 0.16.0-0.34
FL_VERSION = latest-0.8
JL_VERSION = 1.6.0-0.14


# -------------------------------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module "aws_vault" {

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5 |
| <a name="provider_template"></a> [template](#provider\_template) | n/a |

<!-- TFDOCS_PROVIDER_END -->
Expand All @@ -55,8 +55,8 @@ module "aws_vault" {

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5 |

<!-- TFDOCS_REQUIREMENTS_END -->

Expand Down Expand Up @@ -241,7 +241,7 @@ Default:

```json
[
"vault-consul-ubuntu-*"
"vault-consul-ubuntu18-*"
]
```

Expand Down
6 changes: 3 additions & 3 deletions examples/custom-vpc-with-vault/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5 |

## Providers

Expand All @@ -33,7 +33,7 @@ No providers.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_aws_vpc"></a> [aws\_vpc](#module\_aws\_vpc) | github.com/Flaconi/terraform-modules-vpc | v2.1.0 |
| <a name="module_aws_vpc"></a> [aws\_vpc](#module\_aws\_vpc) | github.com/Flaconi/terraform-modules-vpc | v4.0.0 |
| <a name="module_aws_vault"></a> [aws\_vault](#module\_aws\_vault) | ../.. | n/a |

## Resources
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-vpc-with-vault/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# VPC
# -------------------------------------------------------------------------------------------------
module "aws_vpc" {
source = "github.com/Flaconi/terraform-modules-vpc?ref=v2.1.0"
source = "github.com/Flaconi/terraform-modules-vpc?ref=v4.0.0"

# VPC Definition
vpc_cidr = "40.10.0.0/16"
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-vpc-with-vault/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3"
version = ">= 5"
}
}
required_version = ">= 0.13"
required_version = ">= 1.0"
}
2 changes: 1 addition & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module "consul_iam_policies_servers" {
}

module "vault_elb" {
source = "github.com/Flaconi/terraform-aws-elb?ref=v1.1.0"
source = "github.com/Flaconi/terraform-aws-elb?ref=v2.0.0"

name = var.vault_cluster_name
vpc_id = var.vpc_id
Expand Down
10 changes: 5 additions & 5 deletions modules/consul-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ rules.

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5 |
| <a name="provider_null"></a> [null](#provider\_null) | n/a |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_attach_security_group"></a> [attach\_security\_group](#module\_attach\_security\_group) | terraform-aws-modules/security-group/aws | 4.7.0 |
| <a name="module_attach_security_group"></a> [attach\_security\_group](#module\_attach\_security\_group) | terraform-aws-modules/security-group/aws | 5.1.0 |
| <a name="module_iam_policies"></a> [iam\_policies](#module\_iam\_policies) | github.com/hashicorp/terraform-aws-consul//modules/consul-iam-policies | v0.11.0 |
| <a name="module_lc_security_group"></a> [lc\_security\_group](#module\_lc\_security\_group) | terraform-aws-modules/security-group/aws | 4.7.0 |
| <a name="module_lc_security_group"></a> [lc\_security\_group](#module\_lc\_security\_group) | terraform-aws-modules/security-group/aws | 5.1.0 |

## Resources

Expand Down
4 changes: 2 additions & 2 deletions modules/consul-cluster/security-groups.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "attach_security_group" {
source = "terraform-aws-modules/security-group/aws"
version = "4.7.0"
version = "5.1.0"

name = "${var.cluster_name}-att"
description = "Null Placeholder security group for other instances to use as destination to access ${var.cluster_name}"
Expand Down Expand Up @@ -38,7 +38,7 @@ module "attach_security_group" {

module "lc_security_group" {
source = "terraform-aws-modules/security-group/aws"
version = "4.7.0"
version = "5.1.0"

name = var.cluster_name
description = "Security group for the ${var.cluster_name} launch configuration"
Expand Down
4 changes: 2 additions & 2 deletions modules/consul-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 4"
version = ">= 5"
}
}
required_version = ">= 0.13"
required_version = ">= 1.0"
}
10 changes: 5 additions & 5 deletions modules/vault-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,22 @@ machines.

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5 |
| <a name="provider_null"></a> [null](#provider\_null) | n/a |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_attach_security_group"></a> [attach\_security\_group](#module\_attach\_security\_group) | terraform-aws-modules/security-group/aws | 4.7.0 |
| <a name="module_lc_security_group"></a> [lc\_security\_group](#module\_lc\_security\_group) | terraform-aws-modules/security-group/aws | 4.7.0 |
| <a name="module_attach_security_group"></a> [attach\_security\_group](#module\_attach\_security\_group) | terraform-aws-modules/security-group/aws | 5.1.0 |
| <a name="module_lc_security_group"></a> [lc\_security\_group](#module\_lc\_security\_group) | terraform-aws-modules/security-group/aws | 5.1.0 |

## Resources

Expand Down
4 changes: 2 additions & 2 deletions modules/vault-cluster/security-groups.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "attach_security_group" {
source = "terraform-aws-modules/security-group/aws"
version = "4.7.0"
version = "5.1.0"

name = "${var.cluster_name}-att"
description = "Null Placeholder security group for other instances to use as destination to access ${var.cluster_name}"
Expand Down Expand Up @@ -38,7 +38,7 @@ module "attach_security_group" {

module "lc_security_group" {
source = "terraform-aws-modules/security-group/aws"
version = "4.7.0"
version = "5.1.0"

name = var.cluster_name
description = "Security group for the ${var.cluster_name} launch configuration"
Expand Down
4 changes: 2 additions & 2 deletions modules/vault-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 4"
version = ">= 5"
}
}
required_version = ">= 0.13"
required_version = ">= 1.0"
}
2 changes: 1 addition & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ variable "kms_alias_name" {

variable "ami_name_filter" {
description = "Name filter to help pick the AMI."
default = ["vault-consul-ubuntu-*"]
default = ["vault-consul-ubuntu18-*"]
type = list(string)
}

Expand Down
4 changes: 2 additions & 2 deletions versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 4"
version = ">= 5"
}
}
required_version = ">= 0.13"
required_version = ">= 1.0"
}