diff --git a/.gitignore b/.gitignore index 58579d2..9e4002c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ terraform.tf* +.terraform.tf* .terraform -.terraform* \ No newline at end of file +.terraform.lock* \ No newline at end of file diff --git a/.terraform-docs.yml b/.terraform-docs.yml new file mode 100644 index 0000000..7a77f86 --- /dev/null +++ b/.terraform-docs.yml @@ -0,0 +1,8 @@ +# see: https://terraform-docs.io/user-guide/configuration/formatter +formatter: markdown table + +# see: https://terraform-docs.io/user-guide/configuration/header-from +header-from: docs/header.md + +# see: https://terraform-docs.io/user-guide/configuration/footer-from +footer-from: docs/footer.md \ No newline at end of file diff --git a/README.md b/README.md index 685bd00..76f418a 100644 --- a/README.md +++ b/README.md @@ -1,75 +1,57 @@

Welcome to EKS with Istio Setup with Terraform 👋

Version - + Documentation - + License: MIT - + Twitter: fidelissauro

## Terraform Versions Compatibility

- + Terraform 0.13 - + Terraform 0.14 - - + + Terraform 0.15 - + Terraform 1.0.0 - - + + Terraform 1.1.0

- ### 🏠 [Architecture / Topology](/) ![topology](/samples/img/Architecture.png) -# Components / Stack - -| Provider | Version | -|---------------------|---------| -| Terraform | 0.12+ | -| Istio Base | 1.11.0 | -| Istio Ingress | 1.11.0 | -| Istio Egress | 1.11.0 | -| Istio Discovery | 1.11.0 | -| Cluster Autoscaler | v1.21.0 | -| Chaos Mesh | | -| Descheduler | | -| Kube State Metrics | | -| Metrics Server (HPA)| | -| Prometheus Stack | | - - ## Requirements | Name | Version | |------|---------| -| [aws](#requirement\_aws) | ~> 4.0 | +| [aws](#requirement\_aws) | ~> 3.0 | | [helm](#requirement\_helm) | ~> 2.0 | | [kubernetes](#requirement\_kubernetes) | ~> 2.0 | -| [tls](#requirement\_tls) | ~> 2.0 | +| [tls](#requirement\_tls) | ~> 3.1.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | 4.10.0 | -| [helm](#provider\_helm) | 2.5.1 | -| [kubernetes](#provider\_kubernetes) | 2.10.0 | -| [tls](#provider\_tls) | 2.2.0 | +| [aws](#provider\_aws) | 3.54.0 | +| [helm](#provider\_helm) | 2.2.0 | +| [kubernetes](#provider\_kubernetes) | 2.4.1 | +| [tls](#provider\_tls) | 3.1.0 | ## Modules @@ -181,7 +163,7 @@ No modules. | [default\_tags](#input\_default\_tags) | n/a | `map` | 
{
  "Environment": "prod",
  "Foo": "Bar",
  "Ping": "Pong"
}
| no | | [enable\_cross\_zone\_load\_balancing](#input\_enable\_cross\_zone\_load\_balancing) | n/a | `bool` | `true` | no | | [grafana\_kiali\_virtual\_service\_host](#input\_grafana\_kiali\_virtual\_service\_host) | n/a | `string` | `"grafana.kiali.k8s.raj.ninja"` | no | -| [k8s\_version](#input\_k8s\_version) | n/a | `string` | `"1.20"` | no | +| [k8s\_version](#input\_k8s\_version) | n/a | `string` | `"1.22"` | no | | [kiali\_virtual\_service\_host](#input\_kiali\_virtual\_service\_host) | n/a | `string` | `"kiali.k8s.raj.ninja"` | no | | [nlb\_ingress\_enable\_termination\_protection](#input\_nlb\_ingress\_enable\_termination\_protection) | n/a | `bool` | `false` | no | | [nlb\_ingress\_internal](#input\_nlb\_ingress\_internal) | n/a | `bool` | `false` | no | @@ -195,8 +177,6 @@ No modules. |------|-------------| | [cluster\_name](#output\_cluster\_name) | n/a | | [istio\_ingress\_vpclink](#output\_istio\_ingress\_vpclink) | n/a | - - ### ✨ [Demo](/) @@ -209,7 +189,7 @@ terraform apply ## Usage ```sh -terraform apply +terraform apply ``` ## Run tests @@ -229,7 +209,7 @@ terraform plan ## 🤝 Contributing -Contributions, issues and feature requests are welcome!
Feel free to check [issues page](/issues). +Contributions, issues and feature requests are welcome!
Feel free to check [issues page](/issues). ## Show your support @@ -241,4 +221,4 @@ Copyright © 2021 [Matheus Fidelis](https://github.com/msfidelis).
This project is [MIT](/LICENSE ) licensed. *** -_This README was generated with ❤️ by [readme-md-generator](https://github.com/kefranabg/readme-md-generator)_ +\_This README was generated with ❤️ by [readme-md-generator](https://github.com/kefranabg/readme-md-generator)\_ diff --git a/addons.tf b/addons.tf index dbd8ca7..9e8bb65 100644 --- a/addons.tf +++ b/addons.tf @@ -2,7 +2,7 @@ resource "aws_eks_addon" "cni" { cluster_name = aws_eks_cluster.eks_cluster.name addon_name = "vpc-cni" - addon_version = "v1.9.0-eksbuild.1" + addon_version = "v1.11.4-eksbuild.1" resolve_conflicts = "OVERWRITE" depends_on = [ @@ -15,7 +15,7 @@ resource "aws_eks_addon" "coredns" { cluster_name = aws_eks_cluster.eks_cluster.name addon_name = "coredns" - addon_version = "v1.8.3-eksbuild.1" + addon_version = "v1.8.7-eksbuild.1" resolve_conflicts = "OVERWRITE" depends_on = [ @@ -28,7 +28,7 @@ resource "aws_eks_addon" "kubeproxy" { cluster_name = aws_eks_cluster.eks_cluster.name addon_name = "kube-proxy" - addon_version = "v1.20.4-eksbuild.2" + addon_version = "v1.22.11-eksbuild.2" resolve_conflicts = "OVERWRITE" depends_on = [ @@ -40,7 +40,7 @@ resource "aws_eks_addon" "csi_driver" { cluster_name = aws_eks_cluster.eks_cluster.name addon_name = "aws-ebs-csi-driver" - addon_version = "v1.4.0-eksbuild.preview" + addon_version = "v1.11.4-eksbuild.1" resolve_conflicts = "OVERWRITE" depends_on = [ diff --git a/docs/footer.md b/docs/footer.md new file mode 100644 index 0000000..0830d13 --- /dev/null +++ b/docs/footer.md @@ -0,0 +1,45 @@ + +### ✨ [Demo](/) + +## Install + +```sh +terraform apply +``` + +## Usage + +```sh +terraform apply +``` + +## Run tests + +```sh +terraform plan +``` + +## Author + +👤 **Matheus Fidelis** + +* Website: https://raj.ninja +* Twitter: [@fidelissauro](https://twitter.com/fidelissauro) +* Github: [@msfidelis](https://github.com/msfidelis) +* LinkedIn: [@msfidelis](https://linkedin.com/in/msfidelis) + +## 🤝 Contributing + +Contributions, issues and feature requests are welcome!
Feel free to check [issues page](/issues). + +## Show your support + +Give a ⭐️ if this project helped you! + +## 📝 License + +Copyright © 2021 [Matheus Fidelis](https://github.com/msfidelis).
+This project is [MIT](/LICENSE ) licensed. + +*** +_This README was generated with ❤️ by [readme-md-generator](https://github.com/kefranabg/readme-md-generator)_ diff --git a/docs/header.md b/docs/header.md new file mode 100644 index 0000000..aa153bd --- /dev/null +++ b/docs/header.md @@ -0,0 +1,37 @@ +

Welcome to EKS with Istio Setup with Terraform 👋

+

+ Version + + Documentation + + + License: MIT + + + Twitter: fidelissauro + +

+ +## Terraform Versions Compatibility +

+ + Terraform 0.13 + + + Terraform 0.14 + + + Terraform 0.15 + + + Terraform 1.0.0 + + + Terraform 1.1.0 + +

+ + +### 🏠 [Architecture / Topology](/) + +![topology](/samples/img/Architecture.png) \ No newline at end of file diff --git a/provider.tf b/provider.tf index e472be9..f366c7f 100644 --- a/provider.tf +++ b/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "aws" - version = "~> 4.0" + version = "~> 3.0" } helm = { source = "helm" @@ -14,7 +14,7 @@ terraform { } tls = { source = "tls" - version = "~> 2.0" + version = "~> 3.1.0" } } } diff --git a/variables.tf b/variables.tf index ec1d178..ada1afc 100644 --- a/variables.tf +++ b/variables.tf @@ -7,7 +7,7 @@ variable "aws_region" { } variable "k8s_version" { - default = "1.20" + default = "1.22" } variable "nodes_instances_sizes" {