Merge branch 'master' of github.e.it.census.gov:terraform-modules/aws…

…-eks

examples/full-cluster/tf-run.data

@@ -1,4 +1,4 @@
-VERSION 1.1.2
+VERSION 1.1.3
 REMOTE-STATE
 COMMENT make sure the private-lb subnet and container subnets are tagged properly (see README.md)
 STOP then continue with at step %%NEXT%%
@@ -9,6 +9,10 @@ COMMAND tf-init -upgrade
 COMMENT   There are two placeholder files, variables.vpc.auto.tfvars.make-link and variables.vpc.tf.make-link.
 COMMENT   Ensure that variables.vpc.auto.tfvars and variables.vpc.tf are either (a) linked to the files in the parent or vpc/{region}/vpcN/ directory
 COMMENT   or (b) copied from the vpc/{region}/vpcN/ directory if this repo is separate from the main cloud account
+COMMENT
+COMMENT Also check that the variables.application_tags .tf and .auto.tfvars files are linked to the proper includes.d/path/file from the root of the
+COMMENT  git repository.  You will get missing definitions on application_tags otherwise.
+
 STOP    check variables.vpc.* files and then continue with %%NEXT%%
 
 POLICY

examples/full-cluster/variables.vpc.auto.tfvars.make-link

@@ -1,5 +1,9 @@
-# for a submodule/subrepository, copy variables.vpc.auto.tfvars from the appropriate vpc/{region}/vpc{n}/ directory in the main repo
-# for something directly in the main repo for the account, make a link to the file, which is handled by setup-new-directory.sh
-# if you fail to do this, you will get some errors on missing variables
+# For a submodule/subrepository, copy variables.vpc.auto.tfvars from the appropriate vpc/{region}/vpc{n}/ directory in the main repo.
+# In the apps directory, tf-run.data will create links to it.   Any eks-* directories under that will be picked up  and created
+# by setup-new-directory.sh
+#
+# For something directly in the main repo for the account this wil be handled by setup-new-directory.sh as the apps
+# directory includes it already.
+#
+# If you fail to do this, you will get errors on missing variables.
 #
-# you may also wish to copy variables.vpc.tf from that vpc directory in case new variables have been defined for a vpc

examples/full-cluster/variables.vpc.tf.make-link

@@ -1,61 +1,9 @@
-variable "vpc_name" {
-  description = "VPC Name including environment (if necessary), excluding vpc{N}"
-  type        = string
-}
-
-variable "vpc_index" {
-  description = "VPC index number. This used for NACL rule number caculations."
-  type        = number
-}
-
-variable "vpc_cidr_block" {
-  description = "VPC CIDR Block"
-  type        = string
-}
-
-variable "vpc_short_name" {
-  description = "VPC short name component, vpc{index}"
-  type        = string
-}
-
-variable "vpc_environment" {
-  description = "VPC environment purpose (common, shared, dev, stage, ite, prod)"
-  type        = string
-  default     = ""
-}
-
-variable "vpc_enable_igw" {
-  description = "Enable AWS Internet Gateway (IGW) on the VPC (true | false[x])"
-  type        = bool
-  default     = false
-}
-
-variable "vpc_enable_nat" {
-  description = "Enable AWS NAT Gateway on the VPC (true | false[x])"
-  type        = bool
-  default     = false
-}
-
-variable "vpc_enable_vpn" {
-  description = "Enable AWS VPN Configuration on the VPC (true[x] | false)"
-  type        = bool
-  default     = true
-}
-
-variable "vpc_enable_awsdns" {
-  description = "Enable AWS DNS on the VPC"
-  type        = bool
-  default     = false
-}
-
-variable "vpn_settings" {
-  description = "VPN Connection details array of site, bgp_asn_id and ip_address"
-  type = list(object(
-    {
-      site       = string
-      bgp_asn_id = number
-      ip_address = string
-    }
-  ))
-  default = []
-}
+# For a submodule/subrepository, copy variables.vpc.auto.tfvars from the appropriate vpc/{region}/vpc{n}/ directory in the main repo.
+# In the apps directory, tf-run.data will create links to it.   Any eks-* directories under that will be picked up  and created
+# by setup-new-directory.sh
+#
+# For something directly in the main repo for the account this wil be handled by setup-new-directory.sh as the apps
+# directory includes it already.
+#
+# If you fail to do this, you will get errors on missing variables.
+#