gitstream tried to cherry-pick commit 29b6433801e728be975081b0c7d9cad80e17de3a from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Add support for user defined tolerances to modules
There is a requirement to run selected pods on a cordoned node.
One such example is device driver upgrade. The procedure involves
the node to be cordoned. At the same time, there should be a way
to run house keeping pods that carry out the driver upgrades. These
pods should be schedulable.
This PR adds support to carry the tolerances for the pods that carry
out the house keeping operations. These user defined tolerances will
match the taint that gets added to the nodes.
ModuleSpec will be used to carry the tolerance to the pods which will
be used during pod creation
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Output
```
Auto-merging api/v1beta1/module_types.go
Auto-merging api/v1beta1/zz_generated.deepcopy.go
Auto-merging config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml
Auto-merging config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml
Auto-merging config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml
Auto-merging internal/api/moduleloaderdata.go
CONFLICT (modify/delete): internal/build/pod/maker.go deleted in HEAD and modified in 29b64338 (Add support for user defined tolerances to modules). Version 29b64338 (Add support for user defined tolerances to modules) of internal/build/pod/maker.go left in tree.
Auto-merging internal/controllers/build_sign_reconciler.go
Auto-merging internal/controllers/build_sign_reconciler_test.go
Auto-merging internal/controllers/device_plugin_reconciler.go
Auto-merging internal/controllers/module_nmc_reconciler.go
Auto-merging internal/controllers/module_nmc_reconciler_test.go
Auto-merging internal/controllers/nmc_reconciler.go
Auto-merging internal/controllers/nmc_reconciler_test.go
Auto-merging internal/filter/filter.go
Auto-merging internal/module/kernelmapper.go
Auto-merging internal/node/node.go
Auto-merging internal/node/node_test.go
CONFLICT (modify/delete): internal/sign/pod/signer.go deleted in HEAD and modified in 29b64338 (Add support for user defined tolerances to modules). Version 29b64338 (Add support for user defined tolerances to modules) of internal/sign/pod/signer.go left in tree.
error: could not apply 29b64338... Add support for user defined tolerances to modules
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: Disable this message with "git config advice.mergeConflict false"
```
TomerNewman
commented
1 day ago
gitstream tried to cherry-pick commit
29b6433801e728be975081b0c7d9cad80e17de3afromhttps://github.com/kubernetes-sigs/kernel-module-managementbut was unable to do so.Commit message:
Please cherry-pick the commit manually.
Error:
Command:
/usr/bin/git cherry-pick -n 29b6433801e728be975081b0c7d9cad80e17de3a -m1Output
``` Auto-merging api/v1beta1/module_types.go Auto-merging api/v1beta1/zz_generated.deepcopy.go Auto-merging config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml Auto-merging config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml Auto-merging config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml Auto-merging internal/api/moduleloaderdata.go CONFLICT (modify/delete): internal/build/pod/maker.go deleted in HEAD and modified in 29b64338 (Add support for user defined tolerances to modules). Version 29b64338 (Add support for user defined tolerances to modules) of internal/build/pod/maker.go left in tree. Auto-merging internal/controllers/build_sign_reconciler.go Auto-merging internal/controllers/build_sign_reconciler_test.go Auto-merging internal/controllers/device_plugin_reconciler.go Auto-merging internal/controllers/module_nmc_reconciler.go Auto-merging internal/controllers/module_nmc_reconciler_test.go Auto-merging internal/controllers/nmc_reconciler.go Auto-merging internal/controllers/nmc_reconciler_test.go Auto-merging internal/filter/filter.go Auto-merging internal/module/kernelmapper.go Auto-merging internal/node/node.go Auto-merging internal/node/node_test.go CONFLICT (modify/delete): internal/sign/pod/signer.go deleted in HEAD and modified in 29b64338 (Add support for user defined tolerances to modules). Version 29b64338 (Add support for user defined tolerances to modules) of internal/sign/pod/signer.go left in tree. error: could not apply 29b64338... Add support for user defined tolerances to modules hint: after resolving the conflicts, mark the corrected paths hint: with 'git addUpstream-Commit: 29b6433801e728be975081b0c7d9cad80e17de3a