feat(k8s): add max_graceful_termination_sec to autoscaler flag (#1572)

Co-authored-by: Rémy Léone <[email protected]>
scaleway · Nov 30, 2020 · 619b43f · 619b43f
1 parent 34fad70
commit 619b43f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden
@@ -41,6 +41,7 @@ ARGS:
   [autoscaler-config.expendable-pods-priority-cutoff]    Pods with priority below cutoff will be expendable
   [autoscaler-config.scale-down-unneeded-time]           How long a node should be unneeded before it is eligible for scale down
   [autoscaler-config.scale-down-utilization-threshold]   Node utilization level, defined as sum of requested resources divided by capacity, below which a node can be considered for scale down
+  [autoscaler-config.max-graceful-termination-sec]       Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node
   [auto-upgrade.enable]                                  Whether or not auto upgrade is enabled for the cluster
   [auto-upgrade.maintenance-window.start-hour]           The start hour of the 2-hour maintenance window
   [auto-upgrade.maintenance-window.day]                  The day of the week for the maintenance window (any | monday | tuesday | wednesday | thursday | friday | saturday | sunday)

diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden
@@ -26,6 +26,7 @@ ARGS:
   [autoscaler-config.expendable-pods-priority-cutoff]    Pods with priority below cutoff will be expendable
   [autoscaler-config.scale-down-unneeded-time]           How long a node should be unneeded before it is eligible for scale down
   [autoscaler-config.scale-down-utilization-threshold]   Node utilization level, defined as sum of requested resources divided by capacity, below which a node can be considered for scale down
+  [autoscaler-config.max-graceful-termination-sec]       Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node
   [enable-dashboard]                                     The new value of the Kubernetes Dashboard enablement
   [ingress]                                              The new Ingress Controller for the cluster (unknown_ingress | none | nginx | traefik | traefik2)
   [auto-upgrade.enable]                                  Whether or not auto upgrade is enabled for the cluster

diff --git a/internal/namespaces/k8s/v1/k8s_cli.go b/internal/namespaces/k8s/v1/k8s_cli.go
@@ -423,6 +423,13 @@ func k8sClusterCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "autoscaler-config.max-graceful-termination-sec",
+				Short:      `Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "auto-upgrade.enable",
 				Short:      `Whether or not auto upgrade is enabled for the cluster`,
@@ -671,6 +678,13 @@ func k8sClusterUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "autoscaler-config.max-graceful-termination-sec",
+				Short:      `Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "enable-dashboard",
 				Short:      `The new value of the Kubernetes Dashboard enablement`,