summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShelley-BaoYue <baoyue2@huawei.com>2023-12-06 10:32:54 +0800
committerShelley-BaoYue <baoyue2@huawei.com>2023-12-09 18:42:09 +0800
commit2c054ddfb37ea239e225bcdee36fda6113b75dbd (patch)
treeec11ffa26a8a9c183df9bed71918b40cba0de498
parentMerge pull request #5242 from Shelley-BaoYue/automated-cherry-pick-of-#5239-u... (diff)
downloadkubeedge-2c054ddfb37ea239e225bcdee36fda6113b75dbd.tar.gz
fix featuregates
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
-rw-r--r--edge/pkg/edged/edged.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go
index 16e422055..982bb1ae0 100644
--- a/edge/pkg/edged/edged.go
+++ b/edge/pkg/edged/edged.go
@@ -165,6 +165,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,