Merge remote-tracking branch 'upstream/main'

Author: fidel-ibm

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-10-16T12:26:02Z",
+  "generated_at": "2024-10-17T12:26:02Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

examples/obs-agent-iks/main.tf

@@ -129,12 +129,11 @@ resource "time_sleep" "wait_operators" {
 
 module "observability_instances" {
   source                         = "terraform-ibm-modules/observability-instances/ibm"
-  version                        = "3.4.2"
+  version                        = "3.4.3"
   resource_group_id              = module.resource_group.resource_group_id
   region                         = var.region
   cloud_logs_plan                = "standard"
   cloud_monitoring_plan          = "graduated-tier"
-  enable_platform_logs           = false
   enable_platform_metrics        = false
   cloud_logs_instance_name       = "${var.prefix}-cloud-logs"
   cloud_monitoring_instance_name = "${var.prefix}-cloud-monitoring"

examples/obs-agent-ocp/main.tf

@@ -103,20 +103,19 @@ locals {
 }
 
 module "ocp_base" {
-  source                               = "terraform-ibm-modules/base-ocp-vpc/ibm"
-  version                              = "3.41.1"
-  resource_group_id                    = module.resource_group.resource_group_id
-  region                               = var.region
-  tags                                 = var.resource_tags
-  cluster_name                         = var.prefix
-  force_delete_storage                 = true
-  vpc_id                               = ibm_is_vpc.vpc.id
-  vpc_subnets                          = local.cluster_vpc_subnets
-  ocp_version                          = var.ocp_version
-  worker_pools                         = local.worker_pools
-  access_tags                          = var.access_tags
-  ocp_entitlement                      = var.ocp_entitlement
-  import_default_worker_pool_on_create = false
+  source               = "terraform-ibm-modules/base-ocp-vpc/ibm"
+  version              = "3.41.3"
+  resource_group_id    = module.resource_group.resource_group_id
+  region               = var.region
+  tags                 = var.resource_tags
+  cluster_name         = var.prefix
+  force_delete_storage = true
+  vpc_id               = ibm_is_vpc.vpc.id
+  vpc_subnets          = local.cluster_vpc_subnets
+  ocp_version          = var.ocp_version
+  worker_pools         = local.worker_pools
+  access_tags          = var.access_tags
+  ocp_entitlement      = var.ocp_entitlement
 }
 
 data "ibm_container_cluster_config" "cluster_config" {
@@ -130,12 +129,11 @@ data "ibm_container_cluster_config" "cluster_config" {
 
 module "observability_instances" {
   source                         = "terraform-ibm-modules/observability-instances/ibm"
-  version                        = "3.4.2"
+  version                        = "3.4.3"
   resource_group_id              = module.resource_group.resource_group_id
   region                         = var.region
   cloud_logs_plan                = "standard"
   cloud_monitoring_plan          = "graduated-tier"
-  enable_platform_logs           = false
   enable_platform_metrics        = false
   cloud_logs_instance_name       = "${var.prefix}-cloud-logs"
   cloud_monitoring_instance_name = "${var.prefix}-cloud-monitoring"

examples/obs-agent-ocp/version.tf

@@ -6,7 +6,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = ">= 1.70.0"
+      version = ">= 1.71.0"
     }
     helm = {
       source  = "hashicorp/helm"

modules/logs-agent/main.tf

@@ -25,7 +25,7 @@ data "ibm_container_cluster_config" "cluster_config" {
 
 locals {
   logs_agent_chart_location            = "oci://icr.io/ibm/observe/logs-agent-helm"
-  logs_agent_version                   = "1.4.2" # datasource: icr.io/ibm/observe/logs-agent-helm
+  logs_agent_version                   = "1.5.0" # datasource: icr.io/ibm/observe/logs-agent-helm
   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))
   logs_agent_iam_api_key               = var.logs_agent_iam_api_key != null ? var.logs_agent_iam_api_key : ""
   logs_agent_trusted_profile           = var.logs_agent_trusted_profile != null ? var.logs_agent_trusted_profile : ""