[ci skip] Fix path.root references for git-crypt key in openclaw and drone
Modules used filebase64("${path.root}/.git/git-crypt/keys/default")
which breaks with Terragrunt since path.root is now stacks/<service>/
instead of repo root. Changed to accept git_crypt_key_base64 variable
and resolve the path in the stack wrapper.
This commit is contained in:
parent
71bfdc8e89
commit
945a5f35b0
4 changed files with 6 additions and 2 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
variable "tls_secret_name" {}
|
variable "tls_secret_name" {}
|
||||||
|
variable "git_crypt_key_base64" { type = string }
|
||||||
variable "tier" { type = string }
|
variable "tier" { type = string }
|
||||||
variable "github_client_id" {}
|
variable "github_client_id" {}
|
||||||
variable "github_client_secret" {}
|
variable "github_client_secret" {}
|
||||||
|
|
@ -53,7 +54,7 @@ resource "kubernetes_config_map" "git_crypt_key" {
|
||||||
}
|
}
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
"key" = filebase64("${path.root}/.git/git-crypt/keys/default")
|
"key" = var.git_crypt_key_base64
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
variable "tls_secret_name" {}
|
variable "tls_secret_name" {}
|
||||||
|
variable "git_crypt_key_base64" { type = string }
|
||||||
variable "tier" { type = string }
|
variable "tier" { type = string }
|
||||||
variable "ssh_key" {}
|
variable "ssh_key" {}
|
||||||
variable "gemini_api_key" { type = string }
|
variable "gemini_api_key" { type = string }
|
||||||
|
|
@ -62,7 +63,7 @@ resource "kubernetes_config_map" "git_crypt_key" {
|
||||||
namespace = kubernetes_namespace.openclaw.metadata[0].name
|
namespace = kubernetes_namespace.openclaw.metadata[0].name
|
||||||
}
|
}
|
||||||
data = {
|
data = {
|
||||||
"key" = filebase64("${path.root}/.git/git-crypt/keys/default")
|
"key" = var.git_crypt_key_base64
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ locals {
|
||||||
module "drone" {
|
module "drone" {
|
||||||
source = "../../modules/kubernetes/drone"
|
source = "../../modules/kubernetes/drone"
|
||||||
tls_secret_name = var.tls_secret_name
|
tls_secret_name = var.tls_secret_name
|
||||||
|
git_crypt_key_base64 = filebase64("${path.root}/../../.git/git-crypt/keys/default")
|
||||||
github_client_id = var.drone_github_client_id
|
github_client_id = var.drone_github_client_id
|
||||||
github_client_secret = var.drone_github_client_secret
|
github_client_secret = var.drone_github_client_secret
|
||||||
rpc_secret = var.drone_rpc_secret
|
rpc_secret = var.drone_rpc_secret
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ locals {
|
||||||
module "openclaw" {
|
module "openclaw" {
|
||||||
source = "../../modules/kubernetes/openclaw"
|
source = "../../modules/kubernetes/openclaw"
|
||||||
tls_secret_name = var.tls_secret_name
|
tls_secret_name = var.tls_secret_name
|
||||||
|
git_crypt_key_base64 = filebase64("${path.root}/../../.git/git-crypt/keys/default")
|
||||||
ssh_key = var.openclaw_ssh_key
|
ssh_key = var.openclaw_ssh_key
|
||||||
skill_secrets = var.openclaw_skill_secrets
|
skill_secrets = var.openclaw_skill_secrets
|
||||||
gemini_api_key = var.gemini_api_key
|
gemini_api_key = var.gemini_api_key
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue