Adding support for Modules with no OOT kmod #1084
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -2728,7 +2728,6 @@ spec: | |
| type: object | ||
| type: array | ||
| required: | ||
| - selector | ||
| type: object | ||
| selector: | ||
|
|
||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -182,9 +182,10 @@ func (dprh *devicePluginReconcilerHelper) handleDevicePlugin(ctx context.Context | |
| } | ||
|
|
||
| logger := log.FromContext(ctx) | ||
|
|
||
| ds, version := getExistingDSFromVersion(existingDevicePluginDS, mod.Namespace, mod.Name, mod.Spec.ModuleLoader) | ||
| if ds == nil { | ||
| logger.Info("creating new device plugin DS", "version", version) | ||
| ds = &appsv1.DaemonSet{ | ||
| ObjectMeta: metav1.ObjectMeta{Namespace: mod.Namespace, GenerateName: mod.Name + "-device-plugin-"}, | ||
| } | ||
|
|
@@ -203,6 +204,11 @@ func (dprh *devicePluginReconcilerHelper) handleDevicePlugin(ctx context.Context | |
| func (dprh *devicePluginReconcilerHelper) garbageCollect(ctx context.Context, | ||
| mod *kmmv1beta1.Module, | ||
| existingDS []appsv1.DaemonSet) error { | ||
| if mod.Spec.ModuleLoader == nil { | ||
| // If ModuleLoader is not exist, Ordered Upgrade is not relevant | ||
| // so there is no need to delete older-versioned Deamonsets | ||
| return nil | ||
| } | ||
|
|
||
| logger := log.FromContext(ctx) | ||
| deleted := make([]string, 0) | ||
|
|
@@ -248,21 +254,22 @@ func (dprh *devicePluginReconcilerHelper) setKMMOMetrics(ctx context.Context) { | |
| if mod.Spec.DevicePlugin != nil { | ||
| numModulesWithDevicePlugin += 1 | ||
| } | ||
| if mod.Spec.ModuleLoader != nil { | ||
|
There was a problem hiding this comment. WDYT about moving the "if mod.Spec.ModuleLoader != nil {" above line 259? numModulesWithBuild and numModulesWithSign need to be calculated only in case ModuleLoader is not nil. And, in addition, we want have to change the isModuleBuildAndSignCapable function, since the pointer was verified prior to calling that function There was a problem hiding this comment. @yevgeny-shnaidman isModuleBuildAndSignCapable returns |
||
| buildCapable, signCapable := isModuleBuildAndSignCapable(&mod) | ||
| if buildCapable { | ||
| numModulesWithBuild += 1 | ||
| } | ||
| if signCapable { | ||
| numModulesWithSign += 1 | ||
| } | ||
| if mod.Spec.ModuleLoader.Container.Modprobe.Args != nil { | ||
| modprobeArgs := strings.Join(mod.Spec.ModuleLoader.Container.Modprobe.Args.Load, ",") | ||
| dprh.metricsAPI.SetKMMModprobeArgs(mod.Name, mod.Namespace, modprobeArgs) | ||
| } | ||
| if mod.Spec.ModuleLoader.Container.Modprobe.RawArgs != nil { | ||
| modprobeRawArgs := strings.Join(mod.Spec.ModuleLoader.Container.Modprobe.RawArgs.Load, ",") | ||
| dprh.metricsAPI.SetKMMModprobeRawArgs(mod.Name, mod.Namespace, modprobeRawArgs) | ||
| } | ||
| } | ||
| } | ||
| dprh.metricsAPI.SetKMMModulesNum(numModules) | ||
|
|
@@ -348,14 +355,8 @@ func (dsci *daemonSetCreatorImpl) setDevicePluginAsDesired( | |
| }, | ||
| }, | ||
| } | ||
|
|
||
| standardLabels, nodeSelector := generateDevicePluginLabelsAndSelector(mod) | ||
|
|
||
| ds.SetLabels( | ||
| overrideLabels(ds.GetLabels(), standardLabels), | ||
|
|
@@ -395,6 +396,21 @@ func (dsci *daemonSetCreatorImpl) setDevicePluginAsDesired( | |
| return controllerutil.SetControllerReference(mod, ds, dsci.scheme) | ||
| } | ||
|
|
||
| func generateDevicePluginLabelsAndSelector(mod *kmmv1beta1.Module) (map[string]string, map[string]string) { | ||
| labels := map[string]string{constants.ModuleNameLabel: mod.Name} | ||
| nodeSelector := map[string]string{utils.GetKernelModuleReadyNodeLabel(mod.Namespace, mod.Name): ""} | ||
|
|
||
| if mod.Spec.ModuleLoader != nil && mod.Spec.ModuleLoader.Container.Version != "" { | ||
| versionLabel := utils.GetDevicePluginVersionLabelName(mod.Namespace, mod.Name) | ||
| labels[versionLabel] = mod.Spec.ModuleLoader.Container.Version | ||
| nodeSelector[versionLabel] = mod.Spec.ModuleLoader.Container.Version | ||
| } else if mod.Spec.ModuleLoader == nil { | ||
| nodeSelector = mod.Spec.Selector | ||
| } | ||
|
|
||
| return labels, nodeSelector | ||
| } | ||
|
|
||
| func isModuleBuildAndSignCapable(mod *kmmv1beta1.Module) (bool, bool) { | ||
| buildCapable := mod.Spec.ModuleLoader.Container.Build != nil | ||
| signCapable := mod.Spec.ModuleLoader.Container.Sign != nil | ||
|
|
@@ -412,19 +428,23 @@ func isModuleBuildAndSignCapable(mod *kmmv1beta1.Module) (bool, bool) { | |
| return buildCapable, signCapable | ||
| } | ||
|
|
||
| func getExistingDSFromVersion(existingDS []appsv1.DaemonSet, | ||
| moduleNamespace string, | ||
| moduleName string, | ||
| moduleLoader *kmmv1beta1.ModuleLoaderSpec) (*appsv1.DaemonSet, string) { | ||
| version := "" | ||
| if moduleLoader != nil { | ||
| version = moduleLoader.Container.Version | ||
| } | ||
|
|
||
| versionLabel := utils.GetDevicePluginVersionLabelName(moduleNamespace, moduleName) | ||
| for _, ds := range existingDS { | ||
| dsModuleVersion := ds.GetLabels()[versionLabel] | ||
| if dsModuleVersion == version { | ||
| return &ds, version | ||
| } | ||
| } | ||
| return nil, version | ||
| } | ||
|
|
||
| func isOlderVersionUnusedDevicePluginDaemonset(ds *appsv1.DaemonSet, moduleVersion string) bool { | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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.
lets add a comment here that explains why we don't need to go through garbage collect flow in case module loader does not exists