Merge pull request #218 from Lemoncode/terraform-updates

Terraform updates

Author: JaimeSalas

04-cloud/01-eks/02-launching-cluster-eks/readme.md

@@ -39,7 +39,7 @@ kind: ClusterConfig
 metadata:
   name: lc-cluster
   region: eu-west-3
-  version: "1.21"
+  version: "1.28"
 
 iam:
   withOIDC: true
@@ -58,7 +58,7 @@ managedNodeGroups:
 ```bash
 eksctl create cluster \
 --name lc-cluster \
---version 1.21 \
+--version 1.28 \
 --region eu-west-3 \
 --nodegroup-name lc-nodes \
 --node-type t2.small \

04-cloud/01-eks/03-deploy-k8s-dashboard/readme.md

@@ -7,7 +7,7 @@ The official Kubernetes dashboard is not deployed by default, but there are inst
 We can deploy the dashboard with the following command:
 
 ```bash
-export DASHBOARD_VERSION="v2.0.0"
+export DASHBOARD_VERSION="v2.7.0"
 ```
 
 ```bash

04-cloud/01-eks/07-exposing-service/readme.md

@@ -39,6 +39,10 @@ This will create the `nginx-ingress` and the `network load balancer`
 kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v0.49.3/deploy/static/provider/aws/deploy.yaml
 ``` 
 
+```bash
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.8.2/deploy/static/provider/aws/deploy.yaml
+```
+
 Create `apple.deploy.yaml`
 
 ```yaml
@@ -170,6 +174,9 @@ curl -I  http://a2e47070555144b06a0cd99a242d6753-ef17945a5e983c95.elb.eu-west-3.
 
 We get the following response
 
+192.168.5.127
+31848
+
 ```
 HTTP/1.1 404 Not Found
 Server: nginx/1.17.10
@@ -225,4 +232,10 @@ Delete the cluster
 
 ```bash
 eksctl delete cluster --name=lc-cluster
-```
+```
+
+## Updates
+
+- [AWS LB Controller](https://aws.amazon.com/blogs/containers/exposing-kubernetes-applications-part-2-aws-load-balancer-controller/)
+- https://aws.amazon.com/blogs/containers/exposing-kubernetes-applications-part-3-nginx-ingress-controller/
+- https://aws.amazon.com/blogs/containers/exposing-kubernetes-applications-part-1-service-and-ingress-resources/

05-iac/00-terraform/.devcontainer/devcontainer.json

@@ -0,0 +1,27 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+	"name": "Ubuntu",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/base:jammy",
+	"features": {
+		"ghcr.io/devcontainers/features/aws-cli:1": {},
+		"ghcr.io/devcontainers/features/azure-cli:1": {},
+		"ghcr.io/devcontainers/features/terraform:1": {}
+	},
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	"remoteUser": "root"
+}

05-iac/00-terraform/03-desplegando-config-base/readme.md

@@ -41,7 +41,7 @@ aws_instance.web_server.name
 
 Abrimos `./.start-app/main.tf`
 
-```tf
+```ini
 provider "aws" {
   access_key = "ACCESS_KEY"
   secret_key = "SECRET_KEY"
@@ -51,7 +51,7 @@ provider "aws" {
 
 Este bloque le indica a Terraform que usaremos `AWS` como **provider**.
 
-```tf
+```ini
 data "aws_ssm_parameter" "ami" {
   name = "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2"
 }
@@ -63,7 +63,7 @@ Este es un **service manager parameter**, al cual le damos como nombre de etique
 
 En la sección de `NETWORKING` creamos la `VPC`
 
-```tf
+```ini
 resource "aws_vpc" "vpc" {
   cidr_block           = "10.0.0.0/16"
   enable_dns_hostnames = "true"
@@ -73,7 +73,7 @@ resource "aws_vpc" "vpc" {
 
 Después creamos la `internet gateway`, y lo asociamos con la VPC que creamos previamente. Para tal fin usamos `vpc_id = aws_vpc.vpc.id`
 
-```tf
+```ini
 resource "aws_internet_gateway" "igw" {
   vpc_id = aws_vpc.vpc.id
 
@@ -84,7 +84,7 @@ resource "aws_internet_gateway" "igw" {
 
 Creamos una `subnet` asociada a la `VPC`. Gracias a esta entrada `map_public_ip_on_launch = "true"`, obtenemos una IP pública
 
-```tf
+```ini
 resource "aws_subnet" "subnet1" {
   cidr_block              = "10.0.0.0/24"
   vpc_id                  = aws_vpc.vpc.id
@@ -94,7 +94,7 @@ resource "aws_subnet" "subnet1" {
 
 Creamos una `route table`, y la asociamos a nuestra `VPC`. Para ver la documentación oficial de este recurso, seguir el siguiente enlace [Route tables official Docs](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html) 
 
-```tf
+```ini
 resource "aws_route_table" "rtb" {
   vpc_id = aws_vpc.vpc.id
 
@@ -109,7 +109,7 @@ En el bloque anidado, podemos especificar un `route` para añadir a la `route ta
 
 Por último asociamos nuestra `route table` con una única `subnet`
 
-```tf
+```ini
 resource "aws_route_table_association" "rta-subnet1" {
   subnet_id      = aws_subnet.subnet1.id
   route_table_id = aws_route_table.rtb.id
@@ -118,7 +118,7 @@ resource "aws_route_table_association" "rta-subnet1" {
 
 Creamos un `security group` que permita al puerto 80 de cualquier dirección hablar nuestra instancia `EC2`
 
-```tf
+```ini
 # Nginx security group 
 resource "aws_security_group" "nginx-sg" {
   name   = "nginx_sg"
@@ -146,7 +146,7 @@ Estamos asocaindo este `security group` con nuestra `VPC`, y estamos creando un
 
 Por último tenemos la instancia EC2.
 
-```tf
+```ini
 resource "aws_instance" "nginx1" {
   ami                    = nonsensitive(data.aws_ssm_parameter.ami.value)
   instance_type          = "t2.micro"

05-iac/00-terraform/04-usando-inputs-outputs/02-demo.md

@@ -245,7 +245,8 @@ resource "aws_security_group" "nginx-sg" {
 }
 # ....
 ```
-mapas entradas en `variables.tf` para las instancias
+
+Creamos entradas en `variables.tf` para las instancias
 
 ```diff
 

05-iac/00-terraform/05-incorporando-recursos/11-demo.md

@@ -162,6 +162,10 @@ resource "aws_lb_target_group" "nginx" {
 
 ```
 
+```bash
+terraform validate
+```
+
 ### Paso 2. Crear el plan
 
 Ahora estamos listos, para generar el `plan`, pero antes registrar las credenciales, si no están registradas en la terminal:

05-iac/00-terraform/06-incorporando-nuevos-providers/12-demo.md

@@ -24,12 +24,12 @@ Aquí podemos encontrar un [ejemplo de uso del provider](https://registry.terraf
 
 Creamos el fichero `./lab/lc_web_app/providers.tf`
 
-```tf
+```ini
 terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 5.0"
     }
   }
 }
@@ -82,7 +82,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 5.0"
     }
   }
 }

05-iac/00-terraform/06-incorporando-nuevos-providers/13-demo.md

@@ -29,7 +29,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 5.0"
     }
 +
 +   random = {

05-iac/00-terraform/06-incorporando-nuevos-providers/14-demo.md

@@ -19,10 +19,10 @@ Crear `lab/lc_web_app/s3.tf`
 ```tf
 # aws_s3_bucket
 
-# aws_s3_bucket_acl
-
 # aws_s3_bucket_policy
 
+# aws_s3_object
+
 # aws_iam_role
 
 # aws_iam_role_policy