[OCPCLOUD-1209] Run KubeletConfig FeatureGate sync during bootstrap #2668
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -330,14 +330,43 @@ func (ctrl *Controller) handleFeatureErr(err error, key interface{}) { | |
| ctrl.featureQueue.AddAfter(key, 1*time.Minute) | ||
| } | ||
|
|
||
| // generateOriginalKubeletConfigWithFeatureGates generates a KubeletConfig and ensure the correct feature gates are set | ||
| // based on the given FeatureGate. | ||
| func generateOriginalKubeletConfigWithFeatureGates(cc *mcfgv1.ControllerConfig, templatesDir, role string, features *configv1.FeatureGate) (*kubeletconfigv1beta1.KubeletConfiguration, error) { | ||
| originalKubeletIgn, err := generateOriginalKubeletConfigIgn(cc, templatesDir, role, features) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not generate the original Kubelet config ignition: %v", err) | ||
| } | ||
| if originalKubeletIgn.Contents.Source == nil { | ||
| return nil, fmt.Errorf("the original Kubelet source string is empty: %v", err) | ||
| } | ||
| dataURL, err := dataurl.DecodeString(*originalKubeletIgn.Contents.Source) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not decode the original Kubelet source string: %v", err) | ||
| } | ||
| originalKubeConfig, err := decodeKubeletConfig(dataURL.Data) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not deserialize the Kubelet source: %v", err) | ||
| } | ||
|
|
||
| featureGates, err := generateFeatureMap(features, openshiftOnlyFeatureGates...) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not generate features map: %v", err) | ||
| } | ||
|
|
||
| // Merge in Feature Gates. | ||
| // If they are the same, this will be a no-op | ||
| if err := mergo.Merge(&originalKubeConfig.FeatureGates, featureGates, mergo.WithOverride); err != nil { | ||
| return nil, fmt.Errorf("could not merge feature gates: %v", err) | ||
| } | ||
|
|
||
| return originalKubeConfig, nil | ||
| } | ||
|
|
||
| func generateOriginalKubeletConfigIgn(cc *mcfgv1.ControllerConfig, templatesDir, role string, featureGate *configv1.FeatureGate) (*ign3types.File, error) { | ||
| // Render the default templates | ||
| rc := &mtmpl.RenderConfig{ControllerConfigSpec: &cc.Spec, FeatureGate: featureGate} | ||
| generatedConfigs, err := mtmpl.GenerateMachineConfigsForRole(rc, role, templatesDir) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("GenerateMachineConfigsforRole failed with error %s", err) | ||
| } | ||
|
|
@@ -478,12 +507,6 @@ func (ctrl *Controller) syncKubeletConfig(key string) error { | |
| err := fmt.Errorf("could not fetch FeatureGates: %v", err) | ||
| return ctrl.syncStatusOnly(cfg, err) | ||
| } | ||
|
|
||
| for _, pool := range mcpPools { | ||
| if pool.Spec.Configuration.Name == "" { | ||
|
|
@@ -512,20 +535,14 @@ func (ctrl *Controller) syncKubeletConfig(key string) error { | |
| userDefinedSystemReserved := make(map[string]string, 2) | ||
|
|
||
| // Generate the original KubeletConfig | ||
| cc, err := ctrl.ccLister.Get(ctrlcommon.ControllerConfigName) | ||
| if err != nil { | ||
| return fmt.Errorf("could not get ControllerConfig %v", err) | ||
| } | ||
|
|
||
| originalKubeConfig, err := generateOriginalKubeletConfigWithFeatureGates(cc, ctrl.templatesDir, role, features) | ||
| if err != nil { | ||
| return ctrl.syncStatusOnly(cfg, err, "could not get original kubelet config: %v", err) | ||
| } | ||
|
|
||
| // Get the default API Server Security Profile | ||
|
|
@@ -561,29 +578,21 @@ func (ctrl *Controller) syncKubeletConfig(key string) error { | |
| delete(specKubeletConfig.SystemReserved, "cpu") | ||
| } | ||
|
|
||
| // FeatureGates must be set from the FeatureGate. | ||
| // Remove them here to prevent the specKubeletConfig merge overwriting them. | ||
| specKubeletConfig.FeatureGates = nil | ||
|
There was a problem hiding this comment. where does the FeatureGates get injected in for this object? There was a problem hiding this comment. Line 543 uses a new kubelet generator function as part of the refactor, which is shared between this and the feature gate handler, which handles the feature gate injection If you look at 1b4429b explicitly it's a bit easier to see what the change here is I could expand this comment to make this more clear |
||
|
|
||
| // Merge the Old and New | ||
| err = mergo.Merge(originalKubeConfig, specKubeletConfig, mergo.WithOverride) | ||
| if err != nil { | ||
| return ctrl.syncStatusOnly(cfg, err, "could not merge original config and new config: %v", err) | ||
| } | ||
| } | ||
|
|
||
| // Encode the new config into an Ignition File | ||
| kubeletIgnition, err = kubeletConfigToIgnFile(originalKubeConfig) | ||
| if err != nil { | ||
| return ctrl.syncStatusOnly(cfg, err, "could not encode JSON: %v", err) | ||
| } | ||
|
|
||
| if isNotFound { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I'm interpreting this correctly, since you are not storing this as an array, the expected behaviour is that the user only applies 1 config. On the off chance they supply multiple, it will not error but instead have the higher alphanumeric take priority?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, so the expectation is that a customer should only create one, whichever is read last will win, not sure if you want to have logic in here to account for that or not? But I'd expect a customer to only supply one.
Also note, it has to have a particular name,
cluster, so that's why we expect a singleton here