diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-12-11 11:09:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-11 11:09:53 +0800 |
| commit | cebdc4c58bb6761ebc93431f6480e951bf7fef95 (patch) | |
| tree | 3e54b167fe9a0878e7daed6f63b9ecff7d5bd324 | |
| parent | Merge pull request #5241 from Shelley-BaoYue/automated-cherry-pick-of-#5239-u... (diff) | |
| parent | fix featuregates (diff) | |
| download | kubeedge-cebdc4c58bb6761ebc93431f6480e951bf7fef95.tar.gz | |
Merge pull request #5296 from Shelley-BaoYue/automated-cherry-pick-of-#5270-upstream-release-1.14
Automated cherry pick of #5270: fix featuregates didn't take effect in edged config
| -rw-r--r-- | edge/pkg/edged/edged.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go index c300949c2..2ae4fecff 100644 --- a/edge/pkg/edged/edged.go +++ b/edge/pkg/edged/edged.go @@ -166,6 +166,13 @@ func newEdged(enable bool, nodeName, namespace string) (*edged, error) { if !edgedconfig.Config.RegisterNode { kubeletConfig.RegisterNode = false } + + // set feature gates from initial flags-based config + if err := utilfeature.DefaultMutableFeatureGate.SetFromMap(kubeletConfig.FeatureGates); err != nil { + return nil, fmt.Errorf("failed to set feature gates from initial flags-based config: %w", err) + } + + // construct a KubeletServer from kubeletFlags and kubeletConfig kubeletServer := kubeletoptions.KubeletServer{ KubeletFlags: kubeletFlags, KubeletConfiguration: kubeletConfig, |