feat: support kubelet graceful shutdown for Bottlerocket (#4571)

aws · Sep 6, 2023 · 4da3fef · 4da3fef
1 parent d549807
commit 4da3fef
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 29 deletions.
diff --git a/pkg/providers/amifamily/bootstrap/bottlerocketsettings.go b/pkg/providers/amifamily/bootstrap/bottlerocketsettings.go
@@ -43,34 +43,36 @@ type BottlerocketSettings struct {
 
 // BottlerocketKubernetes is k8s specific configuration for bottlerocket api
 type BottlerocketKubernetes struct {
-	APIServer                   *string                          `toml:"api-server"`
-	CloudProvider               *string                          `toml:"cloud-provider"`
-	ClusterCertificate          *string                          `toml:"cluster-certificate"`
-	ClusterName                 *string                          `toml:"cluster-name"`
-	ClusterDNSIP                *string                          `toml:"cluster-dns-ip,omitempty"`
-	NodeLabels                  map[string]string                `toml:"node-labels,omitempty"`
-	NodeTaints                  map[string][]string              `toml:"node-taints,omitempty"`
-	MaxPods                     *int                             `toml:"max-pods,omitempty"`
-	StaticPods                  map[string]BottlerocketStaticPod `toml:"static-pods,omitempty"`
-	EvictionHard                map[string]string                `toml:"eviction-hard,omitempty"`
-	KubeReserved                map[string]string                `toml:"kube-reserved,omitempty"`
-	SystemReserved              map[string]string                `toml:"system-reserved,omitempty"`
-	AllowedUnsafeSysctls        []string                         `toml:"allowed-unsafe-sysctls,omitempty"`
-	ServerTLSBootstrap          *bool                            `toml:"server-tls-bootstrap,omitempty"`
-	RegistryQPS                 *int                             `toml:"registry-qps,omitempty"`
-	RegistryBurst               *int                             `toml:"registry-burst,omitempty"`
-	EventQPS                    *int                             `toml:"event-qps,omitempty"`
-	EventBurst                  *int                             `toml:"event-burst,omitempty"`
-	KubeAPIQPS                  *int                             `toml:"kube-api-qps,omitempty"`
-	KubeAPIBurst                *int                             `toml:"kube-api-burst,omitempty"`
-	ContainerLogMaxSize         *string                          `toml:"container-log-max-size,omitempty"`
-	ContainerLogMaxFiles        *int                             `toml:"container-log-max-files,omitempty"`
-	CPUManagerPolicy            *string                          `toml:"cpu-manager-policy,omitempty"`
-	CPUManagerReconcilePeriod   *string                          `toml:"cpu-manager-reconcile-period,omitempty"`
-	TopologyManagerScope        *string                          `toml:"topology-manager-scope,omitempty"`
-	ImageGCHighThresholdPercent *string                          `toml:"image-gc-high-threshold-percent,omitempty"`
-	ImageGCLowThresholdPercent  *string                          `toml:"image-gc-low-threshold-percent,omitempty"`
-	CPUCFSQuota                 *bool                            `toml:"cpu-cfs-quota-enforced,omitempty"`
+	APIServer                          *string                          `toml:"api-server"`
+	CloudProvider                      *string                          `toml:"cloud-provider"`
+	ClusterCertificate                 *string                          `toml:"cluster-certificate"`
+	ClusterName                        *string                          `toml:"cluster-name"`
+	ClusterDNSIP                       *string                          `toml:"cluster-dns-ip,omitempty"`
+	NodeLabels                         map[string]string                `toml:"node-labels,omitempty"`
+	NodeTaints                         map[string][]string              `toml:"node-taints,omitempty"`
+	MaxPods                            *int                             `toml:"max-pods,omitempty"`
+	StaticPods                         map[string]BottlerocketStaticPod `toml:"static-pods,omitempty"`
+	EvictionHard                       map[string]string                `toml:"eviction-hard,omitempty"`
+	KubeReserved                       map[string]string                `toml:"kube-reserved,omitempty"`
+	SystemReserved                     map[string]string                `toml:"system-reserved,omitempty"`
+	AllowedUnsafeSysctls               []string                         `toml:"allowed-unsafe-sysctls,omitempty"`
+	ServerTLSBootstrap                 *bool                            `toml:"server-tls-bootstrap,omitempty"`
+	RegistryQPS                        *int                             `toml:"registry-qps,omitempty"`
+	RegistryBurst                      *int                             `toml:"registry-burst,omitempty"`
+	EventQPS                           *int                             `toml:"event-qps,omitempty"`
+	EventBurst                         *int                             `toml:"event-burst,omitempty"`
+	KubeAPIQPS                         *int                             `toml:"kube-api-qps,omitempty"`
+	KubeAPIBurst                       *int                             `toml:"kube-api-burst,omitempty"`
+	ContainerLogMaxSize                *string                          `toml:"container-log-max-size,omitempty"`
+	ContainerLogMaxFiles               *int                             `toml:"container-log-max-files,omitempty"`
+	CPUManagerPolicy                   *string                          `toml:"cpu-manager-policy,omitempty"`
+	CPUManagerReconcilePeriod          *string                          `toml:"cpu-manager-reconcile-period,omitempty"`
+	TopologyManagerScope               *string                          `toml:"topology-manager-scope,omitempty"`
+	ImageGCHighThresholdPercent        *string                          `toml:"image-gc-high-threshold-percent,omitempty"`
+	ImageGCLowThresholdPercent         *string                          `toml:"image-gc-low-threshold-percent,omitempty"`
+	CPUCFSQuota                        *bool                            `toml:"cpu-cfs-quota-enforced,omitempty"`
+	ShutdownGracePeriod                *string                          `toml:"shutdown-grace-period,omitempty"`
+	ShutdownGracePeriodForCriticalPods *string                          `toml:"shutdown-grace-period-for-critical-pods,omitempty"`
 }
 
 type BottlerocketStaticPod struct {

diff --git a/website/content/en/preview/concepts/node-templates.md b/website/content/en/preview/concepts/node-templates.md
@@ -406,7 +406,9 @@ spec:
     karpenter.sh/discovery: my-cluster
   userData:  |
     [settings.kubernetes]
-    kube-api-qps = 30
+    "kube-api-qps" = 30
+    "shutdown-grace-period" = "30s"
+    "shutdown-grace-period-for-critical-pods" = "30s"
     [settings.kubernetes.eviction-hard]
     "memory.available" = "20%"
   amiSelector: