feat: Add support to make nodeSelector configurable in agent's daemonset

README.md

@@ -148,6 +148,7 @@ No modules.
 | <a name="input_metrics_filter"></a> [metrics\_filter](#input\_metrics\_filter) | To filter custom metrics you can specify which metrics to include and exclude. For more info, see https://cloud.ibm.com/docs/monitoring?topic=monitoring-change_kube_agent#change_kube_agent_inc_exc_metrics | <pre>list(object({<br/>    include = optional(string)<br/>    exclude = optional(string)<br/>  }))</pre> | `[]` | no |
 | <a name="input_name"></a> [name](#input\_name) | The name to give the agent helm release. | `string` | `"sysdig-agent"` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace to deploy the agent to. | `string` | `"ibm-observe"` | no |
+| <a name="input_node_selector"></a> [node\_selector](#input\_node\_selector) | Map of node selector labels for the DaemonSet pods. Defaults to empty map. | `map(string)` | `{}` | no |
 | <a name="input_priority_class_name"></a> [priority\_class\_name](#input\_priority\_class\_name) | The priority class name for the PriorityClasses assigned to the monitoring agent daemonset. If no value is passed, priority class is not used. | `string` | `null` | no |
 | <a name="input_priority_class_value"></a> [priority\_class\_value](#input\_priority\_class\_value) | The numerical priority assigned to PriorityClass, which determines the importance of monitoring agent daemonset pod within the cluster for both scheduling and eviction decisions. The value only applies if a value was passed for `priority_class_name` | `number` | `10` | no |
 | <a name="input_prometheus_config"></a> [prometheus\_config](#input\_prometheus\_config) | Prometheus configuration for the agent. If you want to enable Prometheus configuration provide the prometheus.yaml file content in `hcl` format. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-monitoring-agent/blob/main/solutions/fully-configurable/DA-types.md#prometheus_config). | `map(any)` | `{}` | no |

ibm_catalog.json

@@ -460,6 +460,11 @@
             {
               "key": "priority_class_value"
             },
+            {
+              "key": "node_selector",
+              "type": "object",
+              "default_value": {}
+            },
             {
               "key": "tolerations",
               "type": "array",

main.tf

@@ -29,7 +29,7 @@ data "ibm_container_cluster_config" "cluster_config" {
 
 locals {
   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
-  use_container_filter = length(var.container_filter) < 0 || var.container_filter == null ? false : true
+  use_container_filter = var.container_filter != null && length(var.container_filter) > 0 ? true : false
   # construct ingestion and api endpoints based on inputs
   monitoring_api_endpoint = "${var.instance_region}.monitoring.cloud.ibm.com"
   scc_wp_api_endpoint     = "${var.instance_region}.security-compliance-secure.cloud.ibm.com"
@@ -265,6 +265,9 @@ resource "helm_release" "cloud_monitoring_agent" {
 %{if var.max_surge != null}
         "maxSurge": ${var.max_surge}
 %{endif}
+%{~if length(var.node_selector) > 0}
+    "nodeSelector": ${jsonencode(var.node_selector)}
+%{~endif}
 EOT
   ]
 

solutions/fully-configurable/main.tf

@@ -77,4 +77,5 @@ module "monitoring_agent" {
   max_surge                       = var.max_surge
   priority_class_name             = var.priority_class_name
   priority_class_value            = var.priority_class_value
+  node_selector                   = var.node_selector
 }

solutions/fully-configurable/variables.tf

@@ -296,6 +296,13 @@ variable "priority_class_value" {
   default     = 10
 }
 
+variable "node_selector" {
+  type        = map(string)
+  nullable    = false
+  description = "Map of node selector labels for the DaemonSet pods. Defaults to empty map."
+  default     = {}
+}
+
 ##############################################################################
 # Metrics related variables
 ##############################################################################

variables.tf

@@ -283,6 +283,13 @@ variable "priority_class_value" {
   default     = 10
 }
 
+variable "node_selector" {
+  type        = map(string)
+  nullable    = false
+  description = "Map of node selector labels for the DaemonSet pods. Defaults to empty map."
+  default     = {}
+}
+
 ##############################################################################
 # Metrics related variables
 ##############################################################################