Merge pull request #51307 from mtaufen/kc-type-refactor
Automatic merge from submit-queue (batch tested with PRs 50381, 51307, 49645, 50995, 51523) Remove deprecated and experimental fields from KubeletConfiguration As we work towards providing a stable (v1) kubeletconfig API, we cannot afford to have deprecated or "experimental" (alpha) fields living in the KubeletConfiguration struct. This removes all existing experimental or deprecated fields, and places them in KubeletFlags instead. I'm going to send another PR after this one that organizes the remaining fields into substructures for readability. Then, we should try to move to v1 ASAP (maybe not v1 in 1.8, given how close we are, but definitely in 1.9). It makes far more sense to focus on a clean API in kubeletconfig v2, than to try and further clean up the existing "API" that everyone already depends on. fixes: #51657 **Release note**: ```release-note NONE ```
This commit is contained in:
@@ -97,7 +97,7 @@ func main() {
|
||||
|
||||
// start the experimental docker shim, if enabled
|
||||
if kubeletFlags.ExperimentalDockershim {
|
||||
if err := app.RunDockershim(kubeletConfig, &kubeletFlags.ContainerRuntimeOptions); err != nil {
|
||||
if err := app.RunDockershim(kubeletFlags, kubeletConfig); err != nil {
|
||||
die(err)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user