Merge branch 'master' into check-beta-feature-output-config-length

Author: morgante

autogen/README.md

@@ -28,7 +28,7 @@ There are multiple examples included in the [examples](./examples/) folder but s
 
 ```hcl
 module "gke" {
-  source                     = "terraform-google-modules/kubernetes-engine/google{% if private_cluster %}//modules/private-cluster{% endif %}"
+  source                     = "terraform-google-modules/kubernetes-engine/google{{ module_path }}"
   project_id                 = "<PROJECT ID>"
   name                       = "gke-test-1"
   region                     = "us-central1"

helpers/generate_modules/generate_modules.py

@@ -46,13 +46,16 @@ def template_options(self, base):
         'private_cluster': False,
     }),
     Module("./modules/private-cluster", {
+        'module_path': '//modules/private-cluster',
         'private_cluster': True
     }),
     Module("./modules/beta-private-cluster", {
+        'module_path': '//modules/beta-private-cluster',
         'private_cluster': True,
         'beta_cluster': True,
     }),
     Module("./modules/beta-public-cluster", {
+        'module_path': '//modules/beta-public-cluster',
         'private_cluster': False,
         'beta_cluster': True,
     }),

modules/beta-private-cluster/README.md

@@ -25,7 +25,7 @@ There are multiple examples included in the [examples](./examples/) folder but s
 
 ```hcl
 module "gke" {
-  source                     = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
+  source                     = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster"
   project_id                 = "<PROJECT ID>"
   name                       = "gke-test-1"
   region                     = "us-central1"

modules/beta-public-cluster/README.md

@@ -23,7 +23,7 @@ There are multiple examples included in the [examples](./examples/) folder but s
 
 ```hcl
 module "gke" {
-  source                     = "terraform-google-modules/kubernetes-engine/google"
+  source                     = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
   project_id                 = "<PROJECT ID>"
   name                       = "gke-test-1"
   region                     = "us-central1"