Skip to content

[release-1.11] 🌱 Makefile: ensure KAL is compiled using golangci-lint v2.7.0#13107

Merged
k8s-ci-robot merged 1 commit intokubernetes-sigs:release-1.11from
chrischdi:pr-kal-golangcilint-2-7-0
Dec 4, 2025
Merged

[release-1.11] 🌱 Makefile: ensure KAL is compiled using golangci-lint v2.7.0#13107
k8s-ci-robot merged 1 commit intokubernetes-sigs:release-1.11from
chrischdi:pr-kal-golangcilint-2-7-0

Conversation

@chrischdi
Copy link
Member

What this PR does / why we need it:

Github actions had been updated to a newer git cli version.

This broke golangcli-lint when building custom plugins like KAL:

v2.7.0 fixed this.

This PR ensures we use the correct version for building KAL, while not bumping golangci-lint used for other linting to control when we do the upgrade and have this as backportable PR.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

/area ci

@k8s-ci-robot k8s-ci-robot added the area/ci Issues or PRs related to ci label Dec 4, 2025
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 4, 2025
@chrischdi chrischdi force-pushed the pr-kal-golangcilint-2-7-0 branch 4 times, most recently from feef7a7 to 055bfcf Compare December 4, 2025 09:51
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 4, 2025
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Dec 4, 2025

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: chrischdi / name: Christian Schlotter (061947f)

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 4, 2025
@chrischdi chrischdi changed the title 🌱 Makefile: ensure KAL is compiled using golangci-lint v2.7.0 🌱 [release-1.11] Makefile: ensure KAL is compiled using golangci-lint v2.7.0 Dec 4, 2025
@k8s-ci-robot
Copy link
Contributor

@chrischdi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-apidiff-main 055bfcf link false /test pull-cluster-api-apidiff-main
pull-cluster-api-build-main 055bfcf link true /test pull-cluster-api-build-main
pull-cluster-api-test-main 055bfcf link true /test pull-cluster-api-test-main
pull-cluster-api-verify-main 055bfcf link true /test pull-cluster-api-verify-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@chrischdi chrischdi changed the base branch from main to release-1.11 December 4, 2025 09:51
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Dec 4, 2025
@chrischdi
Copy link
Member Author

/easycla

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Dec 4, 2025
@chrischdi chrischdi force-pushed the pr-kal-golangcilint-2-7-0 branch from 055bfcf to 061947f Compare December 4, 2025 09:52
@chrischdi
Copy link
Member Author

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot

@chrischdi: I cannot cherry-pick the present PR on top of its base branch (release-1.11).

Details

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@fabriziopandini
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 4, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

DetailsGit tree hash: 5d38be2be9992e5bc657636837e3e2f652c4a2e2

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 4, 2025
@fabriziopandini
Copy link
Member

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@fabriziopandini: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot merged commit 64ec48a into kubernetes-sigs:release-1.11 Dec 4, 2025
18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Dec 4, 2025
@k8s-infra-cherrypick-robot

@chrischdi: base branch (release-1.11) needs to differ from target branch (release-1.11)

Details

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot

@fabriziopandini: #13107 failed to apply on top of branch "release-1.10":

Applying: Makefile: ensure KAL is compiled using golangci-lint v2.7.0
Using index info to reconstruct a base tree...
M	Makefile
M	hack/tools/.custom-gcl.yaml
Falling back to patching base and 3-way merge...
Auto-merging hack/tools/kal/.custom-gcl.yaml
CONFLICT (content): Merge conflict in hack/tools/kal/.custom-gcl.yaml
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
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 Makefile: ensure KAL is compiled using golangci-lint v2.7.0

Details

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@fabriziopandini fabriziopandini changed the title 🌱 [release-1.11] Makefile: ensure KAL is compiled using golangci-lint v2.7.0 [release-1.11] 🌱 Makefile: ensure KAL is compiled using golangci-lint v2.7.0 Dec 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/ci Issues or PRs related to ci cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants