Compare commits
4 Commits
arcodange/
...
arcodange/
| Author | SHA1 | Date | |
|---|---|---|---|
| a0fbe5c655 | |||
| fc28c52b85 | |||
| bfa05ff633 | |||
| e5c537a967 |
@@ -36,7 +36,7 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
gitea_vault_auth:
|
gitea_vault_auth:
|
||||||
name: Auth with gitea for vault
|
name: Auth with gitea for vault
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest-ca
|
||||||
outputs:
|
outputs:
|
||||||
gitea_vault_jwt: ${{steps.gitea_vault_jwt.outputs.id_token}}
|
gitea_vault_jwt: ${{steps.gitea_vault_jwt.outputs.id_token}}
|
||||||
steps:
|
steps:
|
||||||
@@ -50,7 +50,7 @@ jobs:
|
|||||||
name: Tofu
|
name: Tofu
|
||||||
needs:
|
needs:
|
||||||
- gitea_vault_auth
|
- gitea_vault_auth
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest-ca
|
||||||
env:
|
env:
|
||||||
OPENTOFU_VERSION: 1.8.2
|
OPENTOFU_VERSION: 1.8.2
|
||||||
TERRAFORM_VAULT_AUTH_JWT: ${{ needs.gitea_vault_auth.outputs.gitea_vault_jwt }}
|
TERRAFORM_VAULT_AUTH_JWT: ${{ needs.gitea_vault_auth.outputs.gitea_vault_jwt }}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
gitea_vault_auth:
|
gitea_vault_auth:
|
||||||
name: Auth with gitea for vault
|
name: Auth with gitea for vault
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest-ca
|
||||||
outputs:
|
outputs:
|
||||||
gitea_vault_jwt: ${{steps.gitea_vault_jwt.outputs.id_token}}
|
gitea_vault_jwt: ${{steps.gitea_vault_jwt.outputs.id_token}}
|
||||||
steps:
|
steps:
|
||||||
@@ -47,7 +47,7 @@ jobs:
|
|||||||
name: Tofu - Postgres
|
name: Tofu - Postgres
|
||||||
needs:
|
needs:
|
||||||
- gitea_vault_auth
|
- gitea_vault_auth
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest-ca
|
||||||
env:
|
env:
|
||||||
OPENTOFU_VERSION: 1.8.2
|
OPENTOFU_VERSION: 1.8.2
|
||||||
TERRAFORM_VAULT_AUTH_JWT: ${{ needs.gitea_vault_auth.outputs.gitea_vault_jwt }}
|
TERRAFORM_VAULT_AUTH_JWT: ${{ needs.gitea_vault_auth.outputs.gitea_vault_jwt }}
|
||||||
|
|||||||
@@ -14,6 +14,16 @@ resource "cloudflare_r2_bucket" "arcodange_tf" {
|
|||||||
jurisdiction = "eu"
|
jurisdiction = "eu"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# One-time state reconcile. The arcodange-tf R2 bucket already exists in the EU jurisdiction, but its
|
||||||
|
# prior state entry lacked the jurisdiction, so cloudflare provider >= 5.20 read it as "not found" and
|
||||||
|
# tried to recreate it (which fails: "already exists"). Re-import it with the jurisdiction-qualified id
|
||||||
|
# (<account_id>/<bucket_name>/<jurisdiction>) so the next apply adopts the real bucket instead.
|
||||||
|
# This block is a no-op once the bucket is in state and can be removed afterwards.
|
||||||
|
import {
|
||||||
|
to = cloudflare_r2_bucket.arcodange_tf
|
||||||
|
id = "f7fcf28c0823cecb44e53b6e92d5144f/arcodange-tf/eu"
|
||||||
|
}
|
||||||
|
|
||||||
module "cf_r2_arcodange_tf_token" {
|
module "cf_r2_arcodange_tf_token" {
|
||||||
source = "./modules/cloudflare_token"
|
source = "./modules/cloudflare_token"
|
||||||
account_id = local.cloudflare_account_id
|
account_id = local.cloudflare_account_id
|
||||||
|
|||||||
Reference in New Issue
Block a user