Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,25 @@ resource "null_resource" "logdna_bind" {
triggers = {
cluster_id = var.cluster_id
instance_id = data.ibm_resource_instance.logdna_instance[0].guid
kubeconfig = var.cluster_config_file_path
}

provisioner "local-exec" {
command = "${path.module}/scripts/bind-instance.sh ${self.triggers.cluster_id} ${self.triggers.instance_id} ${ibm_resource_key.logdna_instance_key[0].name} ${var.private_endpoint}"

environment = {
SYNC = var.sync
KUBECONFIG = self.triggers.kubeconfig
}
}

provisioner "local-exec" {
when = destroy
command = "${path.module}/scripts/unbind-instance.sh ${self.triggers.cluster_id} ${self.triggers.instance_id}"

environment = {
KUBECONFIG = self.triggers.kubeconfig
}
}
}

Expand Down Expand Up @@ -139,7 +145,7 @@ resource "helm_release" "logdna" {

set {
name = "displayName"
value = "LogDNA"
value = "IBM Logging"
}

set {
Expand Down
2 changes: 1 addition & 1 deletion test/stages/stage-logdna-bind.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module "logdna-bind" {
ibmcloud_api_key = var.ibmcloud_api_key
cluster_id = module.dev_cluster.id
cluster_name = module.dev_cluster.name
cluster_config_file_path = module.dev_cluster.config_file_path
cluster_config_file_path = module.dev_cluster.platform.kubeconfig
tools_namespace = module.dev_tools_namespace.name
name = module.logdna.name
}
1 change: 1 addition & 0 deletions test/stages/stage1-cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ module "dev_cluster" {
vpc_subnets = []
vpc_subnet_count = 0
cos_id = ""
login = true
}