fix: Rebuild examples (#1625)

2026-05-01 04:44:29 +02:00 · 2021-10-12 15:20:14 +02:00
parent 54a5f1e42b
commit 99d289988d
45 changed files with 1281 additions and 708 deletions
--- a/examples/complete/README.md
+++ b/examples/complete/README.md
@@ -25,7 +25,7 @@ Note that this example may create resources which cost money. Run `terraform des
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.22.0 |
-| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 1.11 |
+| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.0 |
 | <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.4 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.1 |

@@ -34,7 +34,7 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.22.0 |
-| <a name="provider_terraform"></a> [terraform](#provider\_terraform) | n/a |
+| <a name="provider_random"></a> [random](#provider\_random) | >= 2.1 |

 ## Modules

@@ -44,6 +44,7 @@ Note that this example may create resources which cost money. Run `terraform des
 | <a name="module_disabled_fargate"></a> [disabled\_fargate](#module\_disabled\_fargate) | ../../modules/fargate |  |
 | <a name="module_disabled_node_groups"></a> [disabled\_node\_groups](#module\_disabled\_node\_groups) | ../../modules/node_groups |  |
 | <a name="module_eks"></a> [eks](#module\_eks) | ../.. |  |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |

 ## Resources

@@ -52,9 +53,10 @@ Note that this example may create resources which cost money. Run `terraform des
 | [aws_security_group.all_worker_mgmt](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
 | [aws_security_group.worker_group_mgmt_one](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
 | [aws_security_group.worker_group_mgmt_two](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
+| [random_string.suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
+| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
 | [aws_eks_cluster.cluster](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster) | data source |
 | [aws_eks_cluster_auth.cluster](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster_auth) | data source |
-| [terraform_remote_state.bootstrap](https://registry.terraform.io/providers/hashicorp/terraform/latest/docs/data-sources/remote_state) | data source |

 ## Inputs

@@ -69,5 +71,4 @@ No inputs.
 | <a name="output_config_map_aws_auth"></a> [config\_map\_aws\_auth](#output\_config\_map\_aws\_auth) | A kubernetes configuration to authenticate to this EKS cluster. |
 | <a name="output_kubectl_config"></a> [kubectl\_config](#output\_kubectl\_config) | kubectl config as generated by the module. |
 | <a name="output_node_groups"></a> [node\_groups](#output\_node\_groups) | Outputs from node groups |
-| <a name="output_region"></a> [region](#output\_region) | AWS region. |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
--- a/examples/complete/main.tf
+++ b/examples/complete/main.tf
@@ -2,15 +2,30 @@ provider "aws" {
  region = local.region
 }

+locals {
+  name            = "complete-${random_string.suffix.result}"
+  cluster_version = "1.20"
+  region          = "eu-west-1"
+}
+
+################################################################################
+# EKS Module
+################################################################################
+
 module "eks" {
  source = "../.."

-  cluster_name    = local.cluster_name
-  cluster_version = "1.21"
+  cluster_name    = local.name
+  cluster_version = local.cluster_version
+
+  vpc_id          = module.vpc.vpc_id
+  subnets         = [module.vpc.private_subnets[0], module.vpc.public_subnets[1]]
+  fargate_subnets = [module.vpc.private_subnets[2]]
+
+  cluster_endpoint_private_access = true
+  cluster_endpoint_public_access  = true
+

-  vpc_id          = local.vpc.vpc_id
-  subnets         = [local.vpc.private_subnets[0], local.vpc.public_subnets[1]]
-  fargate_subnets = [local.vpc.private_subnets[2]]

  worker_additional_security_group_ids = [aws_security_group.all_worker_mgmt.id]

@@ -130,15 +145,15 @@ module "eks" {
  ]

  tags = {
-    Environment = "test"
-    GithubRepo  = "terraform-aws-eks"
-    GithubOrg   = "terraform-aws-modules"
+    Example    = local.name
+    GithubRepo = "terraform-aws-eks"
+    GithubOrg  = "terraform-aws-modules"
  }
 }

-####################
+################################################################################
 # Disabled creation
-####################
+################################################################################

 module "disabled_eks" {
  source = "../.."
@@ -158,9 +173,9 @@ module "disabled_node_groups" {
  create_eks = false
 }

-#############
-# Kubernetes
-#############
+################################################################################
+# Kubernetes provider configuration
+################################################################################

 data "aws_eks_cluster" "cluster" {
  name = module.eks.cluster_id
@@ -177,12 +192,12 @@ provider "kubernetes" {
 }

 ################################################################################
-# Supporting resources
+# Additional security groups for workers
 ################################################################################

 resource "aws_security_group" "worker_group_mgmt_one" {
  name_prefix = "worker_group_mgmt_one"
-  vpc_id      = local.vpc.vpc_id
+  vpc_id      = module.vpc.vpc_id

  ingress {
    from_port = 22
@@ -197,7 +212,7 @@ resource "aws_security_group" "worker_group_mgmt_one" {

 resource "aws_security_group" "worker_group_mgmt_two" {
  name_prefix = "worker_group_mgmt_two"
-  vpc_id      = local.vpc.vpc_id
+  vpc_id      = module.vpc.vpc_id

  ingress {
    from_port = 22
@@ -212,7 +227,7 @@ resource "aws_security_group" "worker_group_mgmt_two" {

 resource "aws_security_group" "all_worker_mgmt" {
  name_prefix = "all_worker_management"
-  vpc_id      = local.vpc.vpc_id
+  vpc_id      = module.vpc.vpc_id

  ingress {
    from_port = 22
@@ -227,21 +242,44 @@ resource "aws_security_group" "all_worker_mgmt" {
  }
 }

-
 ################################################################################
-# Supporting resources (managed in "_bootstrap" directory)
+# Supporting resources
 ################################################################################

-data "terraform_remote_state" "bootstrap" {
-  backend = "local"
+data "aws_availability_zones" "available" {
+}

-  config = {
-    path = "../_bootstrap/terraform.tfstate"
+resource "random_string" "suffix" {
+  length  = 8
+  special = false
+}
+
+module "vpc" {
+  source  = "terraform-aws-modules/vpc/aws"
+  version = "~> 3.0"
+
+  name                 = local.name
+  cidr                 = "10.0.0.0/16"
+  azs                  = data.aws_availability_zones.available.names
+  private_subnets      = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
+  public_subnets       = ["10.0.4.0/24", "10.0.5.0/24", "10.0.6.0/24"]
+  enable_nat_gateway   = true
+  single_nat_gateway   = true
+  enable_dns_hostnames = true
+
+  public_subnet_tags = {
+    "kubernetes.io/cluster/${local.name}" = "shared"
+    "kubernetes.io/role/elb"              = "1"
+  }
+
+  private_subnet_tags = {
+    "kubernetes.io/cluster/${local.name}" = "shared"
+    "kubernetes.io/role/internal-elb"     = "1"
+  }
+
+  tags = {
+    Example    = local.name
+    GithubRepo = "terraform-aws-eks"
+    GithubOrg  = "terraform-aws-modules"
  }
 }
-
-locals {
-  region       = data.terraform_remote_state.bootstrap.outputs.region
-  cluster_name = data.terraform_remote_state.bootstrap.outputs.cluster_name
-  vpc          = data.terraform_remote_state.bootstrap.outputs.vpc
-}
--- a/examples/complete/outputs.tf
+++ b/examples/complete/outputs.tf
@@ -1,8 +1,3 @@
-output "region" {
-  description = "AWS region."
-  value       = local.region
-}
-
 output "cluster_endpoint" {
  description = "Endpoint for EKS control plane."
  value       = module.eks.cluster_endpoint
--- a/examples/complete/variables.tf
+++ b/examples/complete/variables.tf
@@ -1 +0,0 @@
-
--- a/examples/complete/versions.tf
+++ b/examples/complete/versions.tf
@@ -5,6 +5,6 @@ terraform {
    aws        = ">= 3.22.0"
    local      = ">= 1.4"
    random     = ">= 2.1"
-    kubernetes = ">= 1.11"
+    kubernetes = "~> 2.0"
  }
 }