From cc514c362bcd4b657bf6a6d1d37f5305952df363 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 4 Jan 2024 18:13:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/infrastructure/clusters/connect/new_gke_cluster.md | 10 +++++----- doc/user/infrastructure/iac/index.md | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'doc/user/infrastructure') diff --git a/doc/user/infrastructure/clusters/connect/new_gke_cluster.md b/doc/user/infrastructure/clusters/connect/new_gke_cluster.md index 3b20125ff03..839bce217b7 100644 --- a/doc/user/infrastructure/clusters/connect/new_gke_cluster.md +++ b/doc/user/infrastructure/clusters/connect/new_gke_cluster.md @@ -52,7 +52,7 @@ To import the project: This project provides you with: - A [cluster on Google Cloud Platform (GCP)](https://gitlab.com/gitlab-org/configure/examples/gitlab-terraform-gke/-/blob/master/gke.tf) -with defaults for name, location, node count, and Kubernetes version. + with defaults for name, location, node count, and Kubernetes version. - The [GitLab agent for Kubernetes](https://gitlab.com/gitlab-org/configure/examples/gitlab-terraform-gke/-/blob/master/agent.tf) installed in the cluster. ## Register the agent @@ -73,10 +73,10 @@ To create a GitLab agent for Kubernetes: To set up your project to communicate to GCP and the GitLab API: 1. To authenticate GCP with GitLab, create a [GCP service account](https://cloud.google.com/docs/authentication#service-accounts) -with following roles: `Compute Network Viewer`, `Kubernetes Engine Admin`, `Service Account User`, and `Service Account Admin`. Both User and Admin -service accounts are necessary. The User role impersonates the [default service account](https://cloud.google.com/compute/docs/access/service-accounts#default_service_account) -when [creating the node pool](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/using_gke_with_terraform#node-pool-management). -The Admin role creates a service account in the `kube-system` namespace. + with following roles: `Compute Network Viewer`, `Kubernetes Engine Admin`, `Service Account User`, and `Service Account Admin`. Both User and Admin + service accounts are necessary. The User role impersonates the [default service account](https://cloud.google.com/compute/docs/access/service-accounts#default_service_account) + when [creating the node pool](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/using_gke_with_terraform#node-pool-management). + The Admin role creates a service account in the `kube-system` namespace. 1. Download the JSON file with the service account key you created in the previous step. 1. On your computer, encode the JSON file to `base64` (replace `/path/to/sa-key.json` to the path to your key): diff --git a/doc/user/infrastructure/iac/index.md b/doc/user/infrastructure/iac/index.md index d76f5dd736a..616e15dc230 100644 --- a/doc/user/infrastructure/iac/index.md +++ b/doc/user/infrastructure/iac/index.md @@ -84,13 +84,13 @@ To use a Terraform template: ```yaml variables: - TF_STATE_NAME: default - # If your terraform files are in a subdirectory, set TF_ROOT accordingly. For example: - # TF_ROOT: terraform/production + TF_STATE_NAME: default + # If your terraform files are in a subdirectory, set TF_ROOT accordingly. For example: + # TF_ROOT: terraform/production ``` 1. Optional. Override in your `.gitlab-ci.yml` file the attributes present -in the template you fetched to customize your configuration. + in the template you fetched to customize your configuration. ### Terraform template recipes -- cgit v1.2.3