fix: enable handling of vault through helmfiles

main.tf

@@ -117,8 +117,7 @@ module "cluster" {
 // ----------------------------------------------------------------------------
 module "vault" {
   source         = "./modules/vault"
-  external_vault = local.external_vault
-  use_vault      = var.use_vault
+  resource_count = var.use_vault && !local.external_vault && var.install_vault ? 1 : 0
 }
 
 // ----------------------------------------------------------------------------

modules/vault/charts.tf

@@ -1,5 +1,5 @@
 resource "helm_release" "vault-operator" {
-  count            = local.create_vault_resources ? 1 : 0
+  count            = var.resource_count
   name             = "vault-operator"
   chart            = "vault-operator"
   namespace        = "jx-vault"
@@ -9,7 +9,7 @@ resource "helm_release" "vault-operator" {
 }
 
 resource "helm_release" "vault-instance" {
-  count      = local.create_vault_resources ? 1 : 0
+  count      = var.resource_count
   name       = "vault-instance"
   chart      = "vault-instance"
   namespace  = "jx-vault"

modules/vault/variables.tf

@@ -1,15 +1,4 @@
-// ----------------------------------------------------------------------------
-// Optional Variables	// Optional Variables
-// ----------------------------------------------------------------------------
-
-variable "external_vault" {
-  description = "Whether or not Jenkins X creates and manages the Vault instance. If set to true a external Vault URL needs to be provided"
-  type        = bool
-  default     = false
-}
-
-variable "use_vault" {
-  description = "Flag to control vault resource creation"
-  type        = bool
-  default     = true
+variable "resource_count" {
+  description = "Number of resources to create (0 or 1)"
+  type        = number
 }

variables.tf

@@ -34,6 +34,12 @@ variable "vault_url" {
   default     = ""
 }
 
+variable "install_vault" {
+  description = "Whether or not this modules creates and manages the Vault instance. If set to false and use_vault is true either an external Vault URL needs to be provided or you need to install vault operator and instance using helmfile."
+  type        = bool
+  default     = true
+}
+
 // ----------------------------------------------------------------------------
 // Velero/backup
 // ----------------------------------------------------------------------------