search

kubernetes-sigs / kubespray

Deploy a Production Ready Kubernetes Cluster
Apache License 2.0
16.2k stars 6.49k forks source link

Bump version of community.general #11724

Closed VannTen closed 3 days ago

VannTen commented 3 days ago

What type of PR is this? /kind bug

What this PR does / why we need it: We use the persistent option of modprobe, which was introduced in 7.0.0

Special notes for your reviewer: See ansible-collections/community.general#9144

Does this PR introduce a user-facing change?:

Use correct version for community.general collection
VannTen commented 3 days ago

/ok-to-test /cherrypick release-2.24 /cherrypick release-2.25 /cherrypick release-2.26

k8s-infra-cherrypick-robot commented 3 days ago

@VannTen: once the present PR merges, I will cherry-pick it on top of release-2.24, release-2.25, release-2.26 in new PRs and assign them to you.

In response to [this](https://github.com/kubernetes-sigs/kubespray/pull/11724#issuecomment-2482314383): >/ok-to-test >/cherrypick release-2.24 >/cherrypick release-2.25 >/cherrypick release-2.26 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-ci-robot commented 3 days ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrFreezeex, VannTen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/kubernetes-sigs/kubespray/blob/master/OWNERS)~~ [VannTen] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
k8s-infra-cherrypick-robot commented 3 days ago

@VannTen: #11724 failed to apply on top of branch "release-2.24":

Applying: Bump version of community.general
Using index info to reconstruct a base tree...
M   galaxy.yml
Falling back to patching base and 3-way merge...
Auto-merging galaxy.yml
CONFLICT (content): Merge conflict in galaxy.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump version of community.general
In response to [this](https://github.com/kubernetes-sigs/kubespray/pull/11724#issuecomment-2482314383): >/ok-to-test >/cherrypick release-2.24 >/cherrypick release-2.25 >/cherrypick release-2.26 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 3 days ago

@VannTen: #11724 failed to apply on top of branch "release-2.25":

Applying: Bump version of community.general
Using index info to reconstruct a base tree...
M   galaxy.yml
Falling back to patching base and 3-way merge...
Auto-merging galaxy.yml
CONFLICT (content): Merge conflict in galaxy.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump version of community.general
In response to [this](https://github.com/kubernetes-sigs/kubespray/pull/11724#issuecomment-2482314383): >/ok-to-test >/cherrypick release-2.24 >/cherrypick release-2.25 >/cherrypick release-2.26 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 3 days ago

@VannTen: new pull request created: #11726

In response to [this](https://github.com/kubernetes-sigs/kubespray/pull/11724#issuecomment-2482314383): >/ok-to-test >/cherrypick release-2.24 >/cherrypick release-2.25 >/cherrypick release-2.26 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
VannTen commented 3 days ago

The fix is not that essential, so I won't backport 2.25 and 2.24. (Though I think the conflicts are trivial).