Skip to content

Commit ef58f09

Browse files
fix(deps): update dependencies (#638)
1 parent df05c6c commit ef58f09

File tree

8 files changed

+56
-54
lines changed

8 files changed

+56
-54
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Migration:
1515
to = module.logs_agent[0].helm_release.logs_agent
1616
}
1717
```
18-
- However since the helm chart being used in the new [terraform-ibm-monitoring-agent](https://github.com/terraform-ibm-modules/terraform-ibm-monitoring-agent) module is completly different to the helm chart used in this module, there is no way to do an update-in-place. Upgrading to this version will destroy the old helm release and create a new one so please plan accordingly before upgrading.
18+
- However since the helm chart being used in the new [terraform-ibm-monitoring-agent](https://github.com/terraform-ibm-modules/terraform-ibm-monitoring-agent) module is completely different to the helm chart used in this module, there is no way to do an update-in-place. Upgrading to this version will destroy the old helm release and create a new one so please plan accordingly before upgrading.
1919
---
2020

2121
[![Graduated (Supported)](https://img.shields.io/badge/Status-Graduated%20(Supported)-brightgreen)](https://terraform-ibm-modules.github.io/documentation/#/badge-status)

examples/obs-agent-ocp/main.tf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,21 @@ locals {
2222

2323
module "trusted_profile" {
2424
source = "terraform-ibm-modules/trusted-profile/ibm"
25-
version = "2.3.1"
25+
version = "3.1.1"
2626
trusted_profile_name = "${var.prefix}-profile"
2727
trusted_profile_description = "Logs agent Trusted Profile"
2828
# As a `Sender`, you can send logs to your IBM Cloud Logs service instance - but not query or tail logs. This role is meant to be used by agents and routers sending logs.
2929
trusted_profile_policies = [{
30-
roles = ["Sender"]
30+
roles = ["Sender"]
31+
unique_identifier = "${var.prefix}-profile-0"
3132
resources = [{
3233
service = "logs"
3334
}]
3435
}]
3536
# Set up fine-grained authorization for `logs-agent` running in ROKS cluster in `ibm-observe` namespace.
3637
trusted_profile_links = [{
37-
cr_type = "ROKS_SA"
38+
cr_type = "ROKS_SA"
39+
unique_identifier = "${var.prefix}-profile-0"
3840
links = [{
3941
crn = module.ocp_base.cluster_crn
4042
namespace = local.logs_agent_namespace
@@ -104,7 +106,7 @@ locals {
104106

105107
module "ocp_base" {
106108
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
107-
version = "3.54.5"
109+
version = "3.56.1"
108110
resource_group_id = module.resource_group.resource_group_id
109111
region = var.region
110112
tags = var.resource_tags
@@ -147,7 +149,7 @@ data "ibm_is_security_groups" "vpc_security_groups" {
147149
# The below code creates a VPE for Cloud logs in the provisioned VPC which allows the agents to access the private Cloud Logs Ingress endpoint.
148150
module "vpe" {
149151
source = "terraform-ibm-modules/vpe-gateway/ibm"
150-
version = "4.7.1"
152+
version = "4.7.7"
151153
region = var.region
152154
prefix = var.prefix
153155
vpc_id = ibm_is_vpc.vpc.id

examples/obs-agent-ocp/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_version = ">= 1.9.0"
33

44
# Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
5-
# module's version.tf (obs-agent-iks), and 1 example that will always use the latest provider version (this exammple).
5+
# module's version.tf (obs-agent-iks), and 1 example that will always use the latest provider version (this example).
66
required_providers {
77
ibm = {
88
source = "ibm-cloud/ibm"

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ data "ibm_container_cluster_config" "cluster_config" {
2929

3030
locals {
3131
# LOCALS
32-
cluster_name = var.is_vpc_cluster ? data.ibm_container_vpc_cluster.cluster[0].resource_name : data.ibm_container_cluster.cluster[0].resource_name # Not publically documented in provider. See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/4485
32+
cluster_name = var.is_vpc_cluster ? data.ibm_container_vpc_cluster.cluster[0].resource_name : data.ibm_container_cluster.cluster[0].resource_name # Not publicly documented in provider. See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/4485
3333
cloud_monitoring_chart_location = "${path.module}/chart/sysdig-agent"
34-
cloud_monitoring_image_tag_digest = "14.1.1@sha256:60287a9413c79a424aa033ab943957f4f0031eddf7b66d26e764253026bd3c78" # datasource: icr.io/ext/sysdig/agent
34+
cloud_monitoring_image_tag_digest = "14.2.0@sha256:f590c8a7f3e04dc0f798266dd07b8ba25e1f0a120f4bbd3a30b4a77094520dfb" # datasource: icr.io/ext/sysdig/agent
3535
cloud_monitoring_agent_registry = "icr.io/ext/sysdig/agent"
3636
cloud_monitoring_agent_tags = var.cloud_monitoring_add_cluster_name ? concat(["ibm.containers-kubernetes.cluster.name:${local.cluster_name}"], var.cloud_monitoring_agent_tags) : var.cloud_monitoring_agent_tags
3737
cloud_monitoring_host = var.cloud_monitoring_enabled ? var.cloud_monitoring_endpoint_type == "private" ? "ingest.private.${var.cloud_monitoring_instance_region}.monitoring.cloud.ibm.com" : "logs.${var.cloud_monitoring_instance_region}.monitoring.cloud.ibm.com" : null

modules/logs-agent/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ data "ibm_container_cluster_config" "cluster_config" {
2525

2626
locals {
2727
logs_agent_chart_location = "oci://icr.io/ibm/observe/logs-agent-helm"
28-
logs_agent_version = "1.6.1" # datasource: icr.io/ibm/observe/logs-agent-helm
28+
logs_agent_version = "1.6.2" # datasource: icr.io/ibm/observe/logs-agent-helm
2929
logs_agent_selected_log_source_paths = distinct(concat([for namespace in var.logs_agent_log_source_namespaces : "/var/log/containers/*_${namespace}_*.log"], var.logs_agent_selected_log_source_paths))
3030
logs_agent_iam_api_key = var.logs_agent_iam_api_key != null ? var.logs_agent_iam_api_key : ""
3131
logs_agent_trusted_profile = var.logs_agent_trusted_profile != null ? var.logs_agent_trusted_profile : ""
@@ -34,7 +34,7 @@ locals {
3434
for metadata in var.logs_agent_additional_metadata : {
3535
(metadata.key) = metadata.value
3636
}]...) : {} # DO NOT REMOVE "...", it is used to convert list of objects into a single object
37-
cluster_name = var.is_vpc_cluster ? data.ibm_container_vpc_cluster.cluster[0].resource_name : data.ibm_container_cluster.cluster[0].resource_name # Not publically documented in provider. See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/4485
37+
cluster_name = var.is_vpc_cluster ? data.ibm_container_vpc_cluster.cluster[0].resource_name : data.ibm_container_cluster.cluster[0].resource_name # Not publicly documented in provider. See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/4485
3838
}
3939

4040
resource "helm_release" "logs_agent" {

tests/go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ module github.com/terraform-ibm-modules/terraform-ibm-observability-agents
22

33
go 1.24.0
44

5-
toolchain go1.24.5
5+
toolchain go1.25.1
66

77
require (
8-
github.com/stretchr/testify v1.10.0
9-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.58.7
8+
github.com/stretchr/testify v1.11.1
9+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.6
1010
)
1111

1212
require (
@@ -15,7 +15,7 @@ require (
1515
github.com/IBM-Cloud/power-go-client v1.12.0 // indirect
1616
github.com/IBM/cloud-databases-go-sdk v0.8.0 // indirect
1717
github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
18-
github.com/IBM/platform-services-go-sdk v0.85.1 // indirect
18+
github.com/IBM/platform-services-go-sdk v0.86.1 // indirect
1919
github.com/IBM/project-go-sdk v0.3.6 // indirect
2020
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
2121
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
@@ -37,7 +37,7 @@ require (
3737
github.com/go-logr/logr v1.4.2 // indirect
3838
github.com/go-logr/stdr v1.2.2 // indirect
3939
github.com/go-openapi/analysis v0.23.0 // indirect
40-
github.com/go-openapi/errors v0.22.1 // indirect
40+
github.com/go-openapi/errors v0.22.2 // indirect
4141
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4242
github.com/go-openapi/jsonreference v0.21.0 // indirect
4343
github.com/go-openapi/loads v0.22.0 // indirect
@@ -61,7 +61,7 @@ require (
6161
github.com/hashicorp/go-safetemp v1.0.0 // indirect
6262
github.com/hashicorp/go-version v1.7.0 // indirect
6363
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
64-
github.com/hashicorp/terraform-json v0.25.0 // indirect
64+
github.com/hashicorp/terraform-json v0.26.0 // indirect
6565
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
6666
github.com/jinzhu/copier v0.4.0 // indirect
6767
github.com/josharian/intern v1.0.0 // indirect
@@ -84,19 +84,19 @@ require (
8484
github.com/tmccombs/hcl2json v0.6.4 // indirect
8585
github.com/ulikunitz/xz v0.5.11 // indirect
8686
github.com/xanzy/ssh-agent v0.3.3 // indirect
87-
github.com/zclconf/go-cty v1.16.2 // indirect
87+
github.com/zclconf/go-cty v1.16.3 // indirect
8888
go.mongodb.org/mongo-driver v1.17.3 // indirect
8989
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
9090
go.opentelemetry.io/otel v1.35.0 // indirect
9191
go.opentelemetry.io/otel/metric v1.35.0 // indirect
9292
go.opentelemetry.io/otel/trace v1.35.0 // indirect
93-
golang.org/x/crypto v0.40.0 // indirect
94-
golang.org/x/mod v0.25.0 // indirect
95-
golang.org/x/net v0.41.0 // indirect
96-
golang.org/x/sync v0.16.0 // indirect
97-
golang.org/x/sys v0.34.0 // indirect
98-
golang.org/x/text v0.27.0 // indirect
99-
golang.org/x/tools v0.34.0 // indirect
93+
golang.org/x/crypto v0.41.0 // indirect
94+
golang.org/x/mod v0.26.0 // indirect
95+
golang.org/x/net v0.42.0 // indirect
96+
golang.org/x/sync v0.17.0 // indirect
97+
golang.org/x/sys v0.35.0 // indirect
98+
golang.org/x/text v0.28.0 // indirect
99+
golang.org/x/tools v0.35.0 // indirect
100100
gopkg.in/warnings.v0 v0.1.2 // indirect
101101
gopkg.in/yaml.v2 v2.4.0 // indirect
102102
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)