update

Author: Aashiq-J

README.md

@@ -143,7 +143,7 @@ No modules.
 | <a name="input_is_vpc_cluster"></a> [is\_vpc\_cluster](#input\_is\_vpc\_cluster) | Specify true if the target cluster is a VPC cluster, false if it is a classic cluster. | `bool` | `true` | no |
 | <a name="input_kernal_module_image_repository"></a> [kernal\_module\_image\_repository](#input\_kernal\_module\_image\_repository) | The image repository to pull the agent kernal module initContainer image from. | `string` | `"agent-kmodule"` | no |
 | <a name="input_kernel_module_image_tag_digest"></a> [kernel\_module\_image\_tag\_digest](#input\_kernel\_module\_image\_tag\_digest) | The image tag or digest to use for the agent kernel module used by the initContainer. If using digest, it must be in the format of `X.Y.Z@sha256:xxxxx` | `string` | `"14.2.0@sha256:3be3966e2bef75364f55d248156a568a222afaba3067f43c5c642c46b690cca9"` | no |
-| <a name="input_max_surge"></a> [max\_surge](#input\_max\_surge) | The number of pods that can be created above the desired amount of daemonset pods during an update. If `max_surge` is set to null, the `max_surge` setting is ignored.. The variable accepts absolute number or percentage value(e.g., '1' or '10%'). | `string` | `null` | no |
+| <a name="input_max_surge"></a> [max\_surge](#input\_max\_surge) | The number of pods that can be created above the desired amount of daemonset pods during an update. The variable accepts absolute number or percentage value(e.g., '1' or '10%'). | `string` | `"1"` | no |
 | <a name="input_max_unavailable"></a> [max\_unavailable](#input\_max\_unavailable) | The maximum number of pods that can be unavailable during a DaemonSet rolling update. Accepts absolute number or percentage (e.g., '1' or '10%'). | `string` | `"1"` | no |
 | <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 |

ibm_catalog.json

@@ -270,8 +270,8 @@
               "value_constraints": [
                 {
                   "type": "regex",
-                  "description": "The value provided for 'max_surge' must be a positive integer (e.g., '1') or a percentage (e.g., '10%'), or null.",
-                  "value": "^__NULL__$|^\\d+%?$"
+                  "description": "The value provided for 'max_surge' must be a positive integer (e.g., '1') or a percentage (e.g., '10%').",
+                  "value": "^\\d+%?$"
                 }
               ]
             },

main.tf

@@ -262,9 +262,7 @@ resource "helm_release" "cloud_monitoring_agent" {
       "type": "RollingUpdate"
       "rollingUpdate":
         "maxUnavailable": ${var.max_unavailable}
-%{if var.max_surge != null}
         "maxSurge": ${var.max_surge}
-%{endif}
 EOT
   ]
 

solutions/fully-configurable/variables.tf

@@ -255,7 +255,8 @@ variable "max_unavailable" {
 variable "max_surge" {
   type        = string
   description = "The number of pods that can be created above the desired amount of daemonset pods during an update. If `max_surge` is set to null, the `max_surge` setting is ignored.. The variable accepts absolute number or percentage value(e.g., '1' or '10%')."
-  default     = null
+  default     = "1"
+  nullable    = false
 }
 
 variable "priority_class_name" {

variables.tf

@@ -259,14 +259,12 @@ variable "max_unavailable" {
 
 variable "max_surge" {
   type        = string
-  description = "The number of pods that can be created above the desired amount of daemonset pods during an update. If `max_surge` is set to null, the `max_surge` setting is ignored.. The variable accepts absolute number or percentage value(e.g., '1' or '10%')."
-  default     = null
+  description = "The number of pods that can be created above the desired amount of daemonset pods during an update. The variable accepts absolute number or percentage value(e.g., '1' or '10%')."
+  default     = "1"
+  nullable    = false
   validation {
-    condition = (
-      var.max_surge == null ||
-      can(regex("^\\d+%?$", var.max_surge))
-    )
-    error_message = "max_surge must be a positive integer (e.g., '1') or a percentage (e.g., '10%'), or null."
+    condition     = can(regex("^\\d+%?$", var.max_surge))
+    error_message = "max_surge must be a positive integer (e.g., '1') or a percentage (e.g., '10%')."
   }
 }