Skip to content

Cherry-picking error for 40f1f16500f50d6f8dae6aac5d2ef5ce3d0c6f2e #1824

Description

@github-actions

gitstream tried to cherry-pick commit 40f1f16500f50d6f8dae6aac5d2ef5ce3d0c6f2e from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.

Commit message:

Register DRA reconciler with manager

Wire the DRA reconciler into the operator manager:

- Add resourcev1.AddToScheme to register the DRA resource API
- Construct and register DRAReconciler via SetupWithManager
- Add RBAC annotation for resource.k8s.io/deviceclasses
- Add DRA module count to the existing metrics sweep
- Regenerate RBAC manifests and metrics mock

Please cherry-pick the commit manually.


Error:

could not cherry-pick: error running git: exit status 1

Command: /usr/bin/git cherry-pick -n 40f1f16500f50d6f8dae6aac5d2ef5ce3d0c6f2e -m1

Output
Auto-merging cmd/manager/main.go
CONFLICT (content): Merge conflict in cmd/manager/main.go
error: could not apply 40f1f165... Register DRA reconciler with manager
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: Disable this message with "git config set advice.mergeConflict false"


Upstream-Commit: 40f1f16500f50d6f8dae6aac5d2ef5ce3d0c6f2e

Metadata

Metadata

Assignees

Labels

Type

No type

Fields

No fields configured for issues without a type.

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions