From 63f14a7b4c91a47d83aae44229c6af8d49cb186e Mon Sep 17 00:00:00 2001
From: Doug Aaser <douglas.aaser@att.com>
Date: Mon, 21 Oct 2019 17:34:06 +0000
Subject: [PATCH] Change over to static kubelet config

Removing deprecated kubelet command-line flags in favor of a static
kubelet configuration file.

Change-Id: Ib9f5e816db709e62152615ac832b99715ca82e3c
See: https://review.opendev.org/#/c/687927/
---
 global/schemas/promenade/Kubelet/v1.yaml |  2 ++
 global/software/config/Kubelet.yaml      | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/global/schemas/promenade/Kubelet/v1.yaml b/global/schemas/promenade/Kubelet/v1.yaml
index eb3d6939a..6e9b83a61 100644
--- a/global/schemas/promenade/Kubelet/v1.yaml
+++ b/global/schemas/promenade/Kubelet/v1.yaml
@@ -26,6 +26,8 @@ data:
       type: array
       items:
         type: string
+    config_file_overrides:
+      type: object
   required:
     - images
   additionalProperties: false
diff --git a/global/software/config/Kubelet.yaml b/global/software/config/Kubelet.yaml
index 3dd35b6f7..1a33897a8 100644
--- a/global/software/config/Kubelet.yaml
+++ b/global/software/config/Kubelet.yaml
@@ -19,17 +19,22 @@ metadata:
         name: seccomp-default
         path: .seccompDirPath
       dest:
-        path: .arguments[9]
+        path: .arguments
         pattern: SECCOMP_PROFILE_ROOT
+        recurse:
+          depth: 1
 data:
   arguments:
     - --cni-bin-dir=/opt/cni/bin
     - --cni-conf-dir=/etc/cni/net.d
-    - --eviction-max-pod-grace-period=-1
     - --network-plugin=cni
-    - --node-status-update-frequency=5s
-    - --max-pods=200
-    - --kube-api-burst=40
-    - --kube-api-qps=20
     - --seccomp-profile-root=SECCOMP_PROFILE_ROOT
-    - --feature-gates=PodShareProcessNamespace=true
+  config_file_overrides:
+    evictionMaxPodGracePeriod: -1
+    featureGates:
+      PodShareProcessNamespace: true
+      TaintBasedEvictions: false
+    kubeAPIBurst: 40
+    kubeAPIQPS: 20
+    maxPods: 200
+    nodeStatusUpdateFrequency: "5s"