diff --git a/README.md b/README.md index 087e19b..009b464 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ Then perform the following commands on the root folder: | root\_password\_instructions | Instructions for getting the root user's password for initial setup | | token | Token for the GKE cluster that GitLab is deployed in. | - + ## Requirements diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index d3a3354..6ec7e9c 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -14,6 +14,9 @@ timeout: 7200s steps: +- id: swap-module-refs + name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' + args: ['module-swapper'] - id: prepare name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment && chmod 600 /builder/home/.netrc'] diff --git a/examples/simple_example/README.md b/examples/simple_example/README.md index 1d880a7..ddc9509 100644 --- a/examples/simple_example/README.md +++ b/examples/simple_example/README.md @@ -16,7 +16,7 @@ This example illustrates how to use the `gke-gitlab` module. | gitlab\_url | n/a | | root\_password\_instructions | n/a | - + To provision this example, run the following from within this directory: - `terraform init` to get the plugins diff --git a/examples/simple_example/main.tf b/examples/simple_example/main.tf index a61bb79..0b2ae4a 100644 --- a/examples/simple_example/main.tf +++ b/examples/simple_example/main.tf @@ -15,7 +15,9 @@ */ module "gke-gitlab" { - source = "../../" + source = "terraform-google-modules/gke-gitlab/google" + version = "~> 3.0" + project_id = var.project_id certmanager_email = "no-reply@${var.project_id}.example.com" gitlab_deletion_protection = false