wip

getamis · Nov 1, 2023 · d233e16 · d233e16
1 parent 910af4c
commit d233e16
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 12 deletions.
diff --git a/modules/containerd/files/config.toml b/modules/containerd/files/config.toml
@@ -1,3 +1,5 @@
 version = 2
+[debug]
+  level = "${log_level}"
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
   SystemdCgroup = true
diff --git a/modules/containerd/main.tf b/modules/containerd/main.tf
@@ -12,9 +12,10 @@ data "ignition_file" "containerd_config" {
   overwrite = true
 
   content {
-    content = file("${path.module}/files/config.toml")
+    content = templatefile("${path.module}/files/config.toml", {
+      log_level = var.log_level
+    })
   }
-
 }
 
 data "ignition_file" "crictl_config" {

diff --git a/modules/containerd/variables.tf b/modules/containerd/variables.tf
@@ -0,0 +1,5 @@
+variable "log_level" {
+  description = "(Optional) containerd log level (trace, debug, info, warn, error, fatal, panic), default is info"
+  type        = string
+  default      = "info"
+}
diff --git a/modules/docker/main.tf b/modules/docker/main.tf
@@ -1,4 +1,5 @@
 locals {
+  docker_opts   = concat(var.docker_opts, ["--log-level", var.log_level])
   docker_cgroup = concat(var.docker_cgroups, var.docker_cgroup_driver == "systemd" ? ["--exec-opt native.cgroupdriver=systemd"] : [""])
 }
 
@@ -9,7 +10,7 @@ data "ignition_systemd_unit" "docker_dropin" {
   dropin {
     name = "10-dockeropts.conf"
     content = templatefile("${path.module}/templates/10-dockeropts.conf.tpl", {
-      docker_opts    = join(" ", var.docker_opts)
+      docker_opts    = join(" ", local.docker_opts)
       docker_cgroups = join(" ", local.docker_cgroup)
     })
   }

diff --git a/modules/docker/variables.tf b/modules/docker/variables.tf
@@ -20,4 +20,10 @@ variable "docker_cgroups" {
 variable "docker_cgroup_driver" {
   type    = string
   default = "cgroupfs"
+}
+
+variable "log_level" {
+  description = "(Optional) Docker daemon log level (debug, info, warn, error, fatal), default is info"
+  type    = string
+  default = "info"
 }
diff --git a/modules/systemd-networkd/main.tf b/modules/systemd-networkd/main.tf
@@ -1,10 +1,6 @@
 # the systemd-networkd configuration file 10-eni.network and 10-eth.network need to be adjusted after systemd updated
 # Reference: https://github.com/aws/amazon-vpc-cni-k8s/issues/1600
 
-locals {
-  systemd_log_level = var.debug ? "debug" : "warning"
-}
-
 data "ignition_file" "systemd_networkd_log_level" {
 
   mode      = 420
@@ -13,7 +9,7 @@ data "ignition_file" "systemd_networkd_log_level" {
 
   content {
     content = templatefile("${path.module}/templates/10-log-level.conf.tpl", {
-      log_level = local.systemd_log_level
+      log_level = var.log_level
     })
   }
 }

diff --git a/modules/systemd-networkd/variables.tf b/modules/systemd-networkd/variables.tf
@@ -1,7 +1,7 @@
-variable "debug" {
-  description = "(Optional) Enable CoreOS Systemd Networkd debug log or not"
-  type        = bool
-  default     = false
+variable "log_level" {
+  description = "(Optional) The systemd-networkd log level, default is warning"
+  type        = string
+  default      = "warning"
 }
 
 variable "manage_foreign_policy" {