Mirrors
/
flux2
mirror of https://github.com/fluxcd/flux2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/int: Separate ssh key names for Azure & GCP

Browse Source 
- Also update IAM setup docs to include github terraform provider
  configuration with github owner so that it can be used with a
  repository under an organization.

Signed-off-by: Sunny <darkowlzz@protonmail.com>
pull/4092/head
Sunny 2 years ago
parent cdc1c98a11
commit 3b637a5125
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
.github/workflows/e2e-azure.yaml vendored
Unescape Escape View File

@ -110,8 +110,8 @@ jobs:
TF_VAR_azuredevops_org: ${{ secrets.TF_VAR_azuredevops_org }} TF_VAR_azuredevops_org: ${{ secrets.TF_VAR_azuredevops_org }}
TF_VAR_azuredevops_pat: ${{ secrets.TF_VAR_azuredevops_pat }} TF_VAR_azuredevops_pat: ${{ secrets.TF_VAR_azuredevops_pat }}
TF_VAR_location: ${{ vars.TF_VAR_azure_location }} TF_VAR_location: ${{ vars.TF_VAR_azure_location }}
GITREPO_SSH_CONTENTS: ${{ secrets.GITREPO_SSH_CONTENTS }} GITREPO_SSH_CONTENTS: ${{ secrets.AZURE_GITREPO_SSH_CONTENTS }}
GITREPO_SSH_PUB_CONTENTS: ${{ secrets.GITREPO_SSH_PUB_CONTENTS }} GITREPO_SSH_PUB_CONTENTS: ${{ secrets.AZURE_GITREPO_SSH_PUB_CONTENTS }}
run: | run: |
source .env source .env
mkdir -p ./build/ssh mkdir -p ./build/ssh

4
.github/workflows/e2e-gcp.yaml vendored
Unescape Escape View File

@ -78,8 +78,8 @@ jobs:
TF_VAR_gcp_email: ${{ secrets.TF_VAR_gcp_email }} TF_VAR_gcp_email: ${{ secrets.TF_VAR_gcp_email }}
TF_VAR_gcp_keyring: ${{ secret.TF_VAR_gcp_keyring }} TF_VAR_gcp_keyring: ${{ secret.TF_VAR_gcp_keyring }}
TF_VAR_gcp_crypto_key: ${{ secret.TF_VAR_gcp_crypto_key }} TF_VAR_gcp_crypto_key: ${{ secret.TF_VAR_gcp_crypto_key }}
GITREPO_SSH_CONTENTS: ${{ secrets.GITREPO_SSH_CONTENTS }} GITREPO_SSH_CONTENTS: ${{ secrets.GCP_GITREPO_SSH_CONTENTS }}
GITREPO_SSH_PUB_CONTENTS: ${{ secrets.GITREPO_SSH_PUB_CONTENTS }} GITREPO_SSH_PUB_CONTENTS: ${{ secrets.GCP_GITREPO_SSH_PUB_CONTENTS }}
run: | run: |
source .env source .env
mkdir -p ./build/ssh mkdir -p ./build/ssh

38
tests/integration/README.md
Unescape Escape View File

@ -60,9 +60,14 @@ the tests:
To create the necessary IAM role with all the permissions, set up CI secrets and To create the necessary IAM role with all the permissions, set up CI secrets and
variables using variables using
[azure-gh-actions](https://github.com/fluxcd/test-infra/tree/main/tf-modules/azure/github-actions) [azure-gh-actions](https://github.com/fluxcd/test-infra/tree/main/tf-modules/azure/github-actions)
use: use the terraform configuration below. Please make sure all the requirements of
azure-gh-actions are followed before running it.
```hcl ```hcl
provider "github" {
owner = "fluxcd"
}
resource "tls_private_key" "privatekey" { resource "tls_private_key" "privatekey" {
algorithm = "RSA" algorithm = "RSA"
rsa_bits = 4096 rsa_bits = 4096
@ -96,10 +101,10 @@ module "azure_gh_actions" {
github_secret_tenant_id_name = "AZ_ARM_TENANT_ID" github_secret_tenant_id_name = "AZ_ARM_TENANT_ID"
github_secret_custom = { github_secret_custom = {
"TF_VAR_azuredevops_org" = "<org-name>", "TF_VAR_azuredevops_org" = "<azuredevops-org-name>",
"TF_VAR_azuredevops_pat" = "<pat>", "TF_VAR_azuredevops_pat" = "<azuredevops-pat>",
"GITREPO_SSH_CONTENTS" = base64encode(tls_private_key.privatekey.private_key_openssh), "AZURE_GITREPO_SSH_CONTENTS" = base64encode(tls_private_key.privatekey.private_key_openssh),
"GITREPO_SSH_PUB_CONTENTS" = base64encode(tls_private_key.privatekey.public_key_openssh) "AZURE_GITREPO_SSH_PUB_CONTENTS" = base64encode(tls_private_key.privatekey.public_key_openssh)
} }
} }
@ -112,6 +117,9 @@ Copy the `publickey` output printed after applying, or run `terraform output` to
print it again, and add it in the Azure DevOps SSH public keys under the user print it again, and add it in the Azure DevOps SSH public keys under the user
account that'll be used by flux in the tests. account that'll be used by flux in the tests.
**NOTE:** The environment variables used above are for the GitHub workflow that
runs the tests. Change the variable names if needed accordingly.
## GCP ## GCP
### Architecture ### Architecture
@ -188,11 +196,16 @@ Following roles are needed for provisioning the infrastructure and running the t
To create the necessary IAM role with all the permissions, set up CI secrets and To create the necessary IAM role with all the permissions, set up CI secrets and
variables using variables using
[gcp-gh-actions](https://github.com/fluxcd/test-infra/tree/main/tf-modules/gcp/github-actions) [gcp-gh-actions](https://github.com/fluxcd/test-infra/tree/main/tf-modules/gcp/github-actions)
use: use the terraform configuration below. Please make sure all the requirements of
gcp-gh-actions are followed before running it.
```hcl ```hcl
provider "google" {} provider "google" {}
provider "github" {
owner = "fluxcd"
}
resource "tls_private_key" "privatekey" { resource "tls_private_key" "privatekey" {
algorithm = "RSA" algorithm = "RSA"
rsa_bits = 4096 rsa_bits = 4096
@ -221,11 +234,11 @@ module "gcp_gh_actions" {
github_secret_credentials_name = "FLUX2_E2E_GOOGLE_CREDENTIALS" github_secret_credentials_name = "FLUX2_E2E_GOOGLE_CREDENTIALS"
github_secret_custom = { github_secret_custom = {
"TF_VAR_gcp_keyring" = "<keyring-name>", "TF_VAR_gcp_keyring" = "<keyring-name>",
"TF_VAR_gcp_crypto_key" = "<key-name>", "TF_VAR_gcp_crypto_key" = "<key-name>",
"TF_VAR_gcp_email" = "<email>", "TF_VAR_gcp_email" = "<email>",
"GITREPO_SSH_CONTENTS" = base64encode(tls_private_key.privatekey.private_key_openssh), "GCP_GITREPO_SSH_CONTENTS" = base64encode(tls_private_key.privatekey.private_key_openssh),
"GITREPO_SSH_PUB_CONTENTS" = base64encode(tls_private_key.privatekey.public_key_openssh) "GCP_GITREPO_SSH_PUB_CONTENTS" = base64encode(tls_private_key.privatekey.public_key_openssh)
} }
} }
@ -238,6 +251,9 @@ Copy the `publickey` output printed after applying, or run `terraform output` to
print it again, and add it in the Google Source Repository SSH public keys under print it again, and add it in the Google Source Repository SSH public keys under
the user account with email address referred in `TF_VAR_gcp_email` above. the user account with email address referred in `TF_VAR_gcp_email` above.
**NOTE:** The environment variables used above are for the GitHub workflow that
runs the tests. Change the variable names if needed accordingly.
## Tests ## Tests
Each test run is initiated by running `terraform apply` in the provider's terraform directory e.g terraform apply, Each test run is initiated by running `terraform apply` in the provider's terraform directory e.g terraform apply,

Write Preview
Loading…
Cancel
Save