Skip to content

Commit 7f1aa17

Browse files
authored
fix(deps): update to latest agents module:<br> - contains fix for https://github.com/terraform-ibm-modules/terraform-ibm-observability-da/issues/212<br>- update sysdig agent to v13.5.0<br>- update logs agent to 1.3.3 (#215)
1 parent c9556af commit 7f1aa17

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

solutions/agents/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ data "ibm_container_cluster_config" "cluster_config" {
1111

1212
module "observability_agents" {
1313
source = "terraform-ibm-modules/observability-agents/ibm"
14-
version = "2.1.0"
14+
version = "2.3.1"
1515
cluster_id = var.cluster_id
1616
cluster_resource_group_id = var.cluster_resource_group_id
1717
cluster_config_endpoint_type = var.cluster_config_endpoint_type
18+
wait_till_timeout = var.wait_till_timeout
19+
wait_till = var.wait_till
1820
# Cloud Monitoring (Sysdig) Agent
1921
cloud_monitoring_enabled = var.cloud_monitoring_enabled
2022
cloud_monitoring_agent_name = var.prefix != null ? "${var.prefix}-${var.cloud_monitoring_agent_name}" : var.cloud_monitoring_agent_name

tests/pr_test.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,18 @@ const solutionAgentsDADir = "solutions/agents"
2929
const agentsKubeconfigDir = "solutions/agents/kubeconfig"
3030

3131
// Current supported regions for Observability instances
32+
// (NOTE: Disabling some regions temporarily due to known issue in those regions)
3233
var validRegions = []string{
3334
"au-syd",
34-
"eu-de",
35-
"eu-es",
3635
"eu-gb",
37-
"jp-osa",
38-
"jp-tok",
39-
"us-south",
40-
"us-east",
41-
"ca-tor",
42-
"br-sao",
36+
// "eu-de",
37+
// "eu-es",
38+
// "jp-osa",
39+
// "jp-tok",
40+
// "us-south",
41+
// "us-east",
42+
// "ca-tor",
43+
// "br-sao",
4344
}
4445

4546
var sharedInfoSvc *cloudinfo.CloudInfoService
@@ -101,10 +102,12 @@ func TestInstancesInSchematics(t *testing.T) {
101102
func TestRunUpgradeSolutionInstances(t *testing.T) {
102103
t.Parallel()
103104

105+
var region = validRegions[rand.Intn(len(validRegions))]
106+
104107
options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
105108
Testing: t,
106109
TerraformDir: solutionInstanceDADir,
107-
Region: "us-south",
110+
Region: region,
108111
Prefix: "obs-ins-upg",
109112
})
110113

@@ -229,7 +232,8 @@ func TestRunExistingResourcesInstances(t *testing.T) {
229232
realTerraformDir := "./resources/existing-resources"
230233
tempTerraformDir, _ := files.CopyTerraformFolderToTemp(realTerraformDir, fmt.Sprintf(prefix+"-%s", strings.ToLower(random.UniqueId())))
231234
tags := common.GetTagsFromTravis()
232-
region := "us-south"
235+
236+
var region = validRegions[rand.Intn(len(validRegions))]
233237

234238
// Verify ibmcloud_api_key variable is set
235239
checkVariable := "TF_VAR_ibmcloud_api_key"

0 commit comments

Comments
 (0)