mirror of
https://github.com/fluxcd/flux2.git
synced 2026-02-09 01:07:27 +00:00
workflows/e2e-gcp: Fix secret variable typo
Also update terraform config to add a description to the service account and a note about github organization repo. Signed-off-by: Sunny <darkowlzz@protonmail.com>
This commit is contained in:
parent
7141271bae
commit
c2e526ca57
2 changed files with 9 additions and 4 deletions
4
.github/workflows/e2e-gcp.yaml
vendored
4
.github/workflows/e2e-gcp.yaml
vendored
|
|
@ -76,8 +76,8 @@ jobs:
|
|||
TF_VAR_gcp_region: ${{ vars.TF_VAR_gcp_region }}
|
||||
TF_VAR_gcp_zone: ${{ vars.TF_VAR_gcp_zone }}
|
||||
TF_VAR_gcp_email: ${{ secrets.TF_VAR_gcp_email }}
|
||||
TF_VAR_gcp_keyring: ${{ secret.TF_VAR_gcp_keyring }}
|
||||
TF_VAR_gcp_crypto_key: ${{ secret.TF_VAR_gcp_crypto_key }}
|
||||
TF_VAR_gcp_keyring: ${{ secrets.TF_VAR_gcp_keyring }}
|
||||
TF_VAR_gcp_crypto_key: ${{ secrets.TF_VAR_gcp_crypto_key }}
|
||||
GITREPO_SSH_CONTENTS: ${{ secrets.GCP_GITREPO_SSH_CONTENTS }}
|
||||
GITREPO_SSH_PUB_CONTENTS: ${{ secrets.GCP_GITREPO_SSH_PUB_CONTENTS }}
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -218,6 +218,10 @@ variables using
|
|||
use the terraform configuration below. Please make sure all the requirements of
|
||||
gcp-gh-actions are followed before running it.
|
||||
|
||||
**NOTE:** When running the following for a repo under and organization, set the
|
||||
environment variable `GITHUB_ORGANIZATION` if setting the `owner` in the
|
||||
`github` provider doesn't work.
|
||||
|
||||
```hcl
|
||||
provider "google" {}
|
||||
|
||||
|
|
@ -233,8 +237,9 @@ resource "tls_private_key" "privatekey" {
|
|||
module "gcp_gh_actions" {
|
||||
source = "git::https://github.com/fluxcd/test-infra.git//tf-modules/gcp/github-actions"
|
||||
|
||||
gcp_service_account_id = "flux2-e2e-test"
|
||||
gcp_service_account_name = "flux2-e2e-test"
|
||||
gcp_service_account_id = "flux2-e2e-test"
|
||||
gcp_service_account_name = "flux2-e2e-test"
|
||||
gcp_service_account_description = "For running fluxcd/flux2 e2e tests."
|
||||
gcp_roles = [
|
||||
"roles/compute.instanceAdmin.v1",
|
||||
"roles/container.admin",
|
||||
|
|
|
|||
Loading…
Reference in a new issue