mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-12-01 13:53:55 +00:00
Merge pull request #51372 from mtaufen/feature-gate-file
Automatic merge from submit-queue (batch tested with PRs 49971, 51357, 51616, 51649, 51372) Separate feature gates for dynamic kubelet config vs loading from a file This makes it so these two features can be turned on independently, rather than bundling both under dynamic kubelet config. fixes: #51664 ```release-note NONE ```
This commit is contained in:
@@ -78,9 +78,9 @@ type Controller struct {
|
||||
// If the `initConfigDir` is an empty string, skips trying to load the init config.
|
||||
// If the `dynamicConfigDir` is an empty string, skips trying to load checkpoints or download new config,
|
||||
// but will still sync the ConfigOK condition if you call StartSync with a non-nil client.
|
||||
func NewController(initConfigDir string,
|
||||
dynamicConfigDir string,
|
||||
defaultConfig *kubeletconfig.KubeletConfiguration) (*Controller, error) {
|
||||
func NewController(defaultConfig *kubeletconfig.KubeletConfiguration,
|
||||
initConfigDir string,
|
||||
dynamicConfigDir string) (*Controller, error) {
|
||||
var err error
|
||||
|
||||
fs := utilfs.DefaultFs{}
|
||||
|
||||
Reference in New Issue
Block a user