Skip to content

Cherry-picking error for 7ba07c3e8cc8f7a8d0384e7de0a3e192cafab2e8 #1768

@github-actions

Description

@github-actions

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

Commit message:

Bump k8s.io packages from v0.32.3 to v0.35.0

Bump k8s.io/api, k8s.io/apimachinery, k8s.io/client-go
and k8s.io/kubectl to v0.35.0.

This should fix 1211-1214 PRs.

---

In addition because of k8s.io/api v0.35.0 bump,
ToleratesTaint function signature was changed,
 so we need to adjust it in node.go.

Please cherry-pick the commit manually.


Error:

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

Command: /usr/bin/git cherry-pick -n 7ba07c3e8cc8f7a8d0384e7de0a3e192cafab2e8 -m1

Output
Auto-merging config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml
Auto-merging config/crd-hub/bases/kmm.sigs.x-k8s.io_modulebuildsignconfigs.yaml
Auto-merging config/crd-hub/bases/kmm.sigs.x-k8s.io_moduleimagesconfigs.yaml
Auto-merging config/crd-hub/bases/kmm.sigs.x-k8s.io_modules.yaml
Auto-merging config/crd/bases/kmm.sigs.x-k8s.io_modulebuildsignconfigs.yaml
Auto-merging config/crd/bases/kmm.sigs.x-k8s.io_moduleimagesconfigs.yaml
Auto-merging config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging internal/node/node.go
error: could not apply 7ba07c3e... Bump k8s.io packages from v0.32.3 to v0.35.0
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: 7ba07c3e8cc8f7a8d0384e7de0a3e192cafab2e8

Metadata

Metadata

Assignees

Labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions