diff --git a/manifests/config/kubeadm.pp b/manifests/config/kubeadm.pp index 79a045c7..91fdef06 100644 --- a/manifests/config/kubeadm.pp +++ b/manifests/config/kubeadm.pp @@ -101,6 +101,10 @@ # An integer or time string (i.e.: "5m") can be used in case of "periodic". Only integer allowed in case of "revision" # Integer or String # Defaults to 0 (disabled) +# @param etcd_quota_backend_bytes +# Raise alarms when backend size exceeds the given quota. +# An string. set a very small 16MB quota 16*1024*1024 +# Default to 0 (size 2G ) # @param api_server_count # Defaults to undef # @param etcd_version @@ -255,6 +259,7 @@ Integer $etcd_max_wals = $kubernetes::etcd_max_wals, Integer $etcd_max_request_bytes = $kubernetes::etcd_max_request_bytes, Optional[String] $etcd_listen_metric_urls = $kubernetes::etcd_listen_metric_urls, + Optional[String] $etcd_quota_backend_bytes = $kubernetes::etcd_quota_backend_bytes, String $token = $kubernetes::token, String $ttl_duration = $kubernetes::ttl_duration, String $discovery_token_hash = $kubernetes::discovery_token_hash, diff --git a/manifests/init.pp b/manifests/init.pp index c0b7e2f9..b6093586 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -230,6 +230,10 @@ # This will tell etcd how many WAL files to be kept # Defaults to 5 # +# [*etcd_quota_backend_bytes*] +# Raise alarms when backend size exceeds the given quota (0 defaults to low space quota). +# Default to undef +# # [*etcd_max_request_bytes*] # This will tell etcd the maximum size of a request in bytes # Defaults to 1572864 @@ -637,6 +641,7 @@ Variant[String, Integer] $etcd_compaction_retention = 0, Integer $etcd_max_wals = 5, Integer $etcd_max_request_bytes = 1572864, + Optional[String] $etcd_quota_backend_bytes = undef, Optional[String] $etcd_listen_metric_urls = undef, Optional[String] $etcd_ca_key = undef, Optional[String] $etcd_ca_crt = undef, diff --git a/templates/etcd/etcd.service.erb b/templates/etcd/etcd.service.erb index b4ff7452..a2b3a358 100644 --- a/templates/etcd/etcd.service.erb +++ b/templates/etcd/etcd.service.erb @@ -43,6 +43,9 @@ ExecStart=/usr/local/bin/etcd --name <%= @etcd_hostname %> \ --max-request-bytes <%= @etcd_max_request_bytes %> \ <%- if @etcd_listen_metric_urls -%> --listen-metrics-urls <%= @etcd_listen_metric_urls %> \ +<%- end -%> +<%- if @etcd_quota_backend_bytes -%> + --quota-backend-bytes <%= @etcd_quota_backend_bytes %> \ <%- end -%> --max-wals <%= @etcd_max_wals %>