Merge pull request #1532 from gthao313/kubelet-arguments

kubelet: add setting for configuring eventRecordQPS and eventBurst
bottlerocket-os · May 3, 2021 · 149aa53 · 149aa53
2 parents 35afe6b + a9d7890
commit 149aa53
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -331,6 +331,8 @@ The following settings are optional and allow you to further configure your clus
     ```
 * `settings.kubernetes.registry-qps`: The registry pull QPS.
 * `settings.kubernetes.registry-burst`: The maximum size of bursty pulls.
+* `settings.kubernetes.event-qps`: The maximum event creations per second.
+* `settings.kubernetes.event-burst`: The maximum size of a burst of event creations.
 
 You can also optionally specify static pods for your node with the following settings.
 Static pods can be particularly useful when running in standalone mode.

diff --git a/Release.toml b/Release.toml
@@ -43,4 +43,5 @@ version = "1.0.8"
     "migrate_v1.1.0_kubelet-cloud-provider.lz4",
     "migrate_v1.1.0_kubelet-registry-qps-registry-burst.lz4",
     "migrate_v1.1.0_shared-containerd-configs.lz4",
+    "migrate_v1.1.0_kubelet-event-qps-event-burst.lz4",
 ]
diff --git a/packages/kubernetes-1.16/kubelet-config b/packages/kubernetes-1.16/kubelet-config
@@ -40,12 +40,18 @@ evictionHard:
 {{~#if settings.kubernetes.allowed-unsafe-sysctls}}
 allowedUnsafeSysctls: {{settings.kubernetes.allowed-unsafe-sysctls}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-qps}}
+{{~#if settings.kubernetes.registry-qps includeZero=true}}
 registryPullQPS: {{settings.kubernetes.registry-qps}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-burst}}
+{{~#if settings.kubernetes.registry-burst includeZero=true}}
 registryBurst: {{settings.kubernetes.registry-burst}}
 {{~/if}}
+{{~#if settings.kubernetes.event-qps includeZero=true}}
+eventRecordQPS: {{settings.kubernetes.event-qps}}
+{{~/if}}
+{{~#if settings.kubernetes.event-burst includeZero=true}}
+eventBurst: {{settings.kubernetes.event-burst}}
+{{~/if}}
 kubeReserved:
   cpu: "{{kube_reserve_cpu settings.kubernetes.kube-reserved.cpu}}"
   {{~#if settings.kubernetes.kube-reserved.memory}}

diff --git a/packages/kubernetes-1.17/kubelet-config b/packages/kubernetes-1.17/kubelet-config
@@ -40,12 +40,18 @@ evictionHard:
 {{~#if settings.kubernetes.allowed-unsafe-sysctls}}
 allowedUnsafeSysctls: {{settings.kubernetes.allowed-unsafe-sysctls}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-qps}}
+{{~#if settings.kubernetes.registry-qps includeZero=true}}
 registryPullQPS: {{settings.kubernetes.registry-qps}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-burst}}
+{{~#if settings.kubernetes.registry-burst includeZero=true}}
 registryBurst: {{settings.kubernetes.registry-burst}}
 {{~/if}}
+{{~#if settings.kubernetes.event-qps includeZero=true}}
+eventRecordQPS: {{settings.kubernetes.event-qps}}
+{{~/if}}
+{{~#if settings.kubernetes.event-burst includeZero=true}}
+eventBurst: {{settings.kubernetes.event-burst}}
+{{~/if}}
 kubeReserved:
   cpu: "{{kube_reserve_cpu settings.kubernetes.kube-reserved.cpu}}"
   {{~#if settings.kubernetes.kube-reserved.memory}}

diff --git a/packages/kubernetes-1.18/kubelet-config b/packages/kubernetes-1.18/kubelet-config
@@ -40,12 +40,18 @@ evictionHard:
 {{~#if settings.kubernetes.allowed-unsafe-sysctls}}
 allowedUnsafeSysctls: {{settings.kubernetes.allowed-unsafe-sysctls}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-qps}}
+{{~#if settings.kubernetes.registry-qps includeZero=true}}
 registryPullQPS: {{settings.kubernetes.registry-qps}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-burst}}
+{{~#if settings.kubernetes.registry-burst includeZero=true}}
 registryBurst: {{settings.kubernetes.registry-burst}}
 {{~/if}}
+{{~#if settings.kubernetes.event-qps includeZero=true}}
+eventRecordQPS: {{settings.kubernetes.event-qps}}
+{{~/if}}
+{{~#if settings.kubernetes.event-burst includeZero=true}}
+eventBurst: {{settings.kubernetes.event-burst}}
+{{~/if}}
 kubeReserved:
   cpu: "{{kube_reserve_cpu settings.kubernetes.kube-reserved.cpu}}"
   {{~#if settings.kubernetes.kube-reserved.memory}}

diff --git a/packages/kubernetes-1.19/kubelet-config b/packages/kubernetes-1.19/kubelet-config
@@ -40,12 +40,18 @@ evictionHard:
 {{~#if settings.kubernetes.allowed-unsafe-sysctls}}
 allowedUnsafeSysctls: {{settings.kubernetes.allowed-unsafe-sysctls}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-qps}}
+{{~#if settings.kubernetes.registry-qps includeZero=true}}
 registryPullQPS: {{settings.kubernetes.registry-qps}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-burst}}
+{{~#if settings.kubernetes.registry-burst includeZero=true}}
 registryBurst: {{settings.kubernetes.registry-burst}}
 {{~/if}}
+{{~#if settings.kubernetes.event-qps includeZero=true}}
+eventRecordQPS: {{settings.kubernetes.event-qps}}
+{{~/if}}
+{{~#if settings.kubernetes.event-burst includeZero=true}}
+eventBurst: {{settings.kubernetes.event-burst}}
+{{~/if}}
 kubeReserved:
   cpu: "{{kube_reserve_cpu settings.kubernetes.kube-reserved.cpu}}"
   {{~#if settings.kubernetes.kube-reserved.memory}}

diff --git a/packages/kubernetes-1.20/kubelet-config b/packages/kubernetes-1.20/kubelet-config
@@ -40,12 +40,18 @@ evictionHard:
 {{~#if settings.kubernetes.allowed-unsafe-sysctls}}
 allowedUnsafeSysctls: {{settings.kubernetes.allowed-unsafe-sysctls}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-qps}}
+{{~#if settings.kubernetes.registry-qps includeZero=true}}
 registryPullQPS: {{settings.kubernetes.registry-qps}}
 {{~/if}}
-{{~#if settings.kubernetes.registry-burst}}
+{{~#if settings.kubernetes.registry-burst includeZero=true}}
 registryBurst: {{settings.kubernetes.registry-burst}}
 {{~/if}}
+{{~#if settings.kubernetes.event-qps includeZero=true}}
+eventRecordQPS: {{settings.kubernetes.event-qps}}
+{{~/if}}
+{{~#if settings.kubernetes.event-burst includeZero=true}}
+eventBurst: {{settings.kubernetes.event-burst}}
+{{~/if}}
 kubeReserved:
   cpu: "{{kube_reserve_cpu settings.kubernetes.kube-reserved.cpu}}"
   {{~#if settings.kubernetes.kube-reserved.memory}}

diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
@@ -28,6 +28,7 @@ members = [
     "api/migration/migrations/v1.1.0/kubelet-cloud-provider",
     "api/migration/migrations/v1.1.0/kubelet-registry-qps-registry-burst",
     "api/migration/migrations/v1.1.0/shared-containerd-configs",
+    "api/migration/migrations/v1.1.0/kubelet-event-qps-event-burst",
 
     "bottlerocket-release",
 

diff --git a/sources/api/migration/migrations/v1.1.0/kubelet-event-qps-event-burst/Cargo.toml b/sources/api/migration/migrations/v1.1.0/kubelet-event-qps-event-burst/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "kubelet-event-qps-event-burst"
+version = "0.1.0"
+authors = ["Tianhao Geng <tianhg@amazon.com>"]
+license = "Apache-2.0 OR MIT"
+edition = "2018"
+publish = false
+# Don't rebuild crate just because of changes to README.
+exclude = ["README.md"]
+
+[dependencies]
+migration-helpers = { path = "../../../migration-helpers" }
diff --git a/sources/api/migration/migrations/v1.1.0/kubelet-event-qps-event-burst/src/main.rs b/sources/api/migration/migrations/v1.1.0/kubelet-event-qps-event-burst/src/main.rs
@@ -0,0 +1,24 @@
+#![deny(rust_2018_idioms)]
+
+use migration_helpers::common_migrations::AddSettingsMigration;
+use migration_helpers::{migrate, Result};
+use std::process;
+
+/// We added two new settings for configuring kubelet, `settings.kubernetes.event-qps`
+/// and `settings.kubernetes.event-burst`
+fn run() -> Result<()> {
+    migrate(AddSettingsMigration(&[
+        "settings.kubernetes.event-qps",
+        "settings.kubernetes.event-burst",
+    ]))
+}
+
+// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
+// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
+// https://github.com/shepmaster/snafu/issues/110
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{}", e);
+        process::exit(1);
+    }
+}
diff --git a/sources/models/src/lib.rs b/sources/models/src/lib.rs
@@ -141,6 +141,8 @@ struct KubernetesSettings {
     cloud_provider: KubernetesCloudProvider,
     registry_qps: i32,
     registry_burst: i32,
+    event_qps: i32,
+    event_burst: i32,
 
     // Settings where we generate a value based on the runtime environment.  The user can specify a
     // value to override the generated one, but typically would not.