Skip to content

Commit 7a87e58

Browse files
authored
enh: update terraform modules, providers (#270)
1 parent 1476aec commit 7a87e58

File tree

19 files changed

+219
-374
lines changed

19 files changed

+219
-374
lines changed

docker/aws-eks-utils/Dockerfile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM alpine:3.13.5
1+
FROM public.ecr.aws/docker/library/alpine:3.15.4
22

3-
ARG TERRAFORM_VERSION="0.15.1"
4-
ARG TERRAGRUNT_VERSION="0.29.2"
5-
ARG HELM_VERSION="3.5.4"
6-
ARG HELMFILE_VERSION="0.138.7"
7-
ARG KUBECTL_VERSION="1.21.0"
3+
ARG TERRAFORM_VERSION="1.1.8"
4+
ARG TERRAGRUNT_VERSION="0.36.7"
5+
ARG HELM_VERSION="3.8.2"
6+
ARG HELMFILE_VERSION="0.144.0"
7+
ARG KUBECTL_VERSION="1.22.0"
88
ENV BASE_URL="https://get.helm.sh"
99
ENV TAR_FILE="helm-v${HELM_VERSION}-linux-amd64.tar.gz"
1010

@@ -47,10 +47,6 @@ RUN pip install awscli --upgrade
4747
RUN wget https://storage.googleapis.com/kubernetes-release/release/v"$KUBECTL_VERSION"/bin/linux/amd64/kubectl \
4848
&& chmod +x kubectl && mv kubectl /bin/kubectl
4949

50-
#Install AWS IAM authentificator
51-
RUN curl -L https://amazon-eks.s3-us-west-2.amazonaws.com/1.13.7/2019-06-11/bin/linux/amd64/aws-iam-authenticator -o /usr/local/bin/aws-iam-authenticator \
52-
&& chmod +x /usr/local/bin/aws-iam-authenticator
53-
5450
#Install docker
5551
RUN apk add --no-cache --update docker
5652

docker/postgresql-backups/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:12-alpine
1+
FROM public.ecr.aws/docker/library/postgres:12-alpine
22

33
#Install python and pip
44
RUN echo "**** install Python ****" && \

docker/postgresql-exporter-script/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:12-alpine
1+
FROM public.ecr.aws/docker/library/postgres:12-alpine
22

33
WORKDIR /app
44

docker/terraform-utils/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM alpine:3.13.5
2-
ARG TERRAFORM_VERSION="0.15.1"
1+
FROM public.ecr.aws/docker/library/alpine:3.15.4
2+
ARG TERRAFORM_VERSION="1.1.8"
33

44
WORKDIR /tmp
55

terraform/.terraform-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.10
1+
1.1.8

terraform/.terragrunt-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.35.8
1+
0.36.7

terraform/layer1-aws/.terraform.lock.hcl

Lines changed: 55 additions & 154 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

terraform/layer1-aws/README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -111,43 +111,43 @@
111111

112112
| Name | Version |
113113
|------|---------|
114-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | 1.0.10 |
115-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 3.72.0 |
116-
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | 1.13.1 |
117-
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | 2.6.1 |
114+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | 1.1.8 |
115+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 4.10.0 |
116+
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | 1.14.0 |
117+
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | 2.10.0 |
118118

119119
## Providers
120120

121121
| Name | Version |
122122
|------|---------|
123-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 3.72.0 |
124-
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | 1.13.1 |
123+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.10.0 |
124+
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | 1.14.0 |
125125

126126
## Modules
127127

128128
| Name | Source | Version |
129129
|------|--------|---------|
130-
| <a name="module_acm"></a> [acm](#module\_acm) | terraform-aws-modules/acm/aws | 3.2.0 |
130+
| <a name="module_acm"></a> [acm](#module\_acm) | terraform-aws-modules/acm/aws | 3.3.0 |
131131
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 18.9.0 |
132132
| <a name="module_pritunl"></a> [pritunl](#module\_pritunl) | ../modules/aws-ec2-pritunl | n/a |
133-
| <a name="module_r53_zone"></a> [r53\_zone](#module\_r53\_zone) | terraform-aws-modules/route53/aws//modules/zones | 2.3.0 |
134-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 3.11.0 |
135-
| <a name="module_vpc_gateway_endpoints"></a> [vpc\_gateway\_endpoints](#module\_vpc\_gateway\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 3.11.0 |
133+
| <a name="module_r53_zone"></a> [r53\_zone](#module\_r53\_zone) | terraform-aws-modules/route53/aws//modules/zones | 2.5.0 |
134+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 3.12.0 |
135+
| <a name="module_vpc_gateway_endpoints"></a> [vpc\_gateway\_endpoints](#module\_vpc\_gateway\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 3.12.0 |
136136

137137
## Resources
138138

139139
| Name | Type |
140140
|------|------|
141-
| [aws_ebs_encryption_by_default.this](https://registry.terraform.io/providers/aws/3.72.0/docs/resources/ebs_encryption_by_default) | resource |
142-
| [aws_kms_key.eks](https://registry.terraform.io/providers/aws/3.72.0/docs/resources/kms_key) | resource |
143-
| [kubectl_manifest.this](https://registry.terraform.io/providers/gavinbunney/kubectl/1.13.1/docs/resources/manifest) | resource |
144-
| [aws_acm_certificate.main](https://registry.terraform.io/providers/aws/3.72.0/docs/data-sources/acm_certificate) | data source |
145-
| [aws_availability_zones.available](https://registry.terraform.io/providers/aws/3.72.0/docs/data-sources/availability_zones) | data source |
146-
| [aws_caller_identity.current](https://registry.terraform.io/providers/aws/3.72.0/docs/data-sources/caller_identity) | data source |
147-
| [aws_eks_cluster.main](https://registry.terraform.io/providers/aws/3.72.0/docs/data-sources/eks_cluster) | data source |
148-
| [aws_eks_cluster_auth.main](https://registry.terraform.io/providers/aws/3.72.0/docs/data-sources/eks_cluster_auth) | data source |
149-
| [aws_route53_zone.main](https://registry.terraform.io/providers/aws/3.72.0/docs/data-sources/route53_zone) | data source |
150-
| [aws_security_group.default](https://registry.terraform.io/providers/aws/3.72.0/docs/data-sources/security_group) | data source |
141+
| [aws_ebs_encryption_by_default.this](https://registry.terraform.io/providers/aws/4.10.0/docs/resources/ebs_encryption_by_default) | resource |
142+
| [aws_kms_key.eks](https://registry.terraform.io/providers/aws/4.10.0/docs/resources/kms_key) | resource |
143+
| [kubectl_manifest.this](https://registry.terraform.io/providers/gavinbunney/kubectl/1.14.0/docs/resources/manifest) | resource |
144+
| [aws_acm_certificate.main](https://registry.terraform.io/providers/aws/4.10.0/docs/data-sources/acm_certificate) | data source |
145+
| [aws_availability_zones.available](https://registry.terraform.io/providers/aws/4.10.0/docs/data-sources/availability_zones) | data source |
146+
| [aws_caller_identity.current](https://registry.terraform.io/providers/aws/4.10.0/docs/data-sources/caller_identity) | data source |
147+
| [aws_eks_cluster.main](https://registry.terraform.io/providers/aws/4.10.0/docs/data-sources/eks_cluster) | data source |
148+
| [aws_eks_cluster_auth.main](https://registry.terraform.io/providers/aws/4.10.0/docs/data-sources/eks_cluster_auth) | data source |
149+
| [aws_route53_zone.main](https://registry.terraform.io/providers/aws/4.10.0/docs/data-sources/route53_zone) | data source |
150+
| [aws_security_group.default](https://registry.terraform.io/providers/aws/4.10.0/docs/data-sources/security_group) | data source |
151151

152152
## Inputs
153153

terraform/layer1-aws/aws-acm.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "acm" {
22
source = "terraform-aws-modules/acm/aws"
3-
version = "3.2.0"
3+
version = "3.3.0"
44

55
create_certificate = var.create_acm_certificate
66

terraform/layer1-aws/aws-r53.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "r53_zone" {
22
source = "terraform-aws-modules/route53/aws//modules/zones"
3-
version = "2.3.0"
3+
version = "2.5.0"
44

55
create = var.create_r53_zone
66

0 commit comments

Comments
 (0)