Skip to content

Commit d470433

Browse files
authored
Merge pull request #443 from sap-contributions/lifecycle-prevent-destroy-literal
Fix: use literal value for prevent_destroy in lifecycle dr_create
2 parents 40c012e + 0ea37b6 commit d470433

File tree

5 files changed

+5
-13
lines changed

5 files changed

+5
-13
lines changed

docs/concourse/region_change.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ For cost saving reasons, you can migrate the Concourse deployment to a different
3838
## Destroy the Current Concourse Deployment
3939
1. Credhub secret deletion prevention
4040

41-
1.1 In `config.yaml` set `credhub_secret_prevent_destroy` to `false` (the default is `true`).
42-
43-
1.1 Open file `terraform-modules/concourse/dr_create/credhub_encryption_key.tf` Comment module "assertion_encryption_key_identical" (if you receive `Error: Unsupported OpenTofu Core version`).
41+
1.1 Open file `terraform-modules/concourse/dr_create/credhub_encryption_key.tf`.
42+
1.1 In resource "google_secret_manager_secret_version", comment the "lifecycle" block (to disable `prevent_destroy = true`).
43+
1.1 Comment module "assertion_encryption_key_identical" (if you receive `Error: Unsupported OpenTofu Core version`).
4444
1. In `config.yaml`, set `db_terraform_deletion_protection` and `db_engine_level_deletion_protection` to `false` (the default is `true`).
4545
1. In `config.yaml` set `gke_deletion_protection` to `false` (the default is `true`).
4646
1. Go to folder `terragrunt/concourse-wg-ci[-test]/infra` and run `terragrunt apply`. This updates the deletion protection settings for the Cloud SQL database and the GKE cluster.
@@ -63,7 +63,7 @@ For cost saving reasons, you can migrate the Concourse deployment to a different
6363
gke_controlplane_version: "1.31"
6464
```
6565
1. Revert the changes in the Terraform files:
66-
- In `config.yaml` set `credhub_secret_prevent_destroy` to `true`.
66+
- In `terraform-modules/concourse/dr_create/credhub_encryption_key.tf`, uncomment the "lifecycle" block.
6767
- Uncomment module "assertion_encryption_key_identical" (if you commented it before).
6868
- In `config.yaml`, set `db_terraform_deletion_protection` and `db_engine_level_deletion_protection` to `true`.
6969
- In `config.yaml`, set `gke_deletion_protection` to `true`.

terraform-modules/concourse/dr_create/credhub_encryption_key.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ resource "google_secret_manager_secret_version" "credhub_encryption_key" {
3131
secret = google_secret_manager_secret.credhub_encryption_key.id
3232
secret_data = base64decode(data.kubernetes_secret_v1.credhub_encryption_key.binary_data.password)
3333
lifecycle {
34-
prevent_destroy = var.credhub_secret_prevent_destroy
34+
prevent_destroy = true
3535

3636
# If omitted or unset terraform destroys previous versions which will make it impossible to
3737
# restore them. This is relevant in case of a desaster recovery where the

terraform-modules/concourse/dr_create/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,3 @@ variable "zone" { nullable = false }
44

55
variable "gke_name" { nullable = false }
66

7-
variable "credhub_secret_prevent_destroy" {
8-
description = "Prevent deletion of credhub encryption key secret version"
9-
type = bool
10-
default = true
11-
nullable = false
12-
}

terragrunt/concourse-wg-ci/config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ gke_cloud_nat_min_ports_per_vm: 16384
8080
# provisioning of loadbalancers
8181
gke_http_load_balancing_disabled: false
8282

83-
credhub_secret_prevent_destroy: true
8483

8584
# IAM
8685
wg_ci_human_account_permissions: [

terragrunt/concourse-wg-ci/dr_create/terragrunt.hcl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,4 @@ inputs = {
3535
zone = local.config.zone
3636

3737
gke_name = local.config.gke_name
38-
credhub_secret_prevent_destroy = local.config.credhub_secret_prevent_destroy
3938
}

0 commit comments

Comments
 (0)