chore: pin buf to 1.71.0 in Makefile and CI to fix format drift#8929
Merged
Conversation
abigailliang-aks-sig-node
requested review from
AbelHu,
Devinwong,
SriHarsha001,
awesomenix,
calvin197,
cameronmeissner,
djsly,
ganeshkumarashok,
karenychen,
lilypan26,
mxj220,
pdamianov-dev,
phealy,
r2k1,
runzhen,
sulixu,
surajssd,
timmy-wright,
titilambert,
xuexu6666 and
zachary-bailey
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the aks-node-controller developer tooling to align the locally-pinned Buf version with what CI is currently using, reducing buf format drift when regenerating protobuf outputs.
Changes:
- Bump the Buf Docker image used by
aks-node-controller/Makefilefrombufbuild/buf:1.47.2tobufbuild/buf:1.71.0.
abigailliang-aks-sig-node
force-pushed
the
fix/pin-buf-version-in-ci
branch
from
9493c9f to
7dd5590
Compare
abigailliang-aks-sig-node
changed the title
abigailliang-aks-sig-node
changed the title
Contributor
|
The latest Buf updates on your PR. Results from workflow Buf CI / buf (pull_request).
|
abigailliang-aks-sig-node
force-pushed
the
fix/pin-buf-version-in-ci
branch
from
7dd5590 to
51c0d00
Compare
awesomenix
approved these changes
Jul 14, 2026
Devinwong
approved these changes
Jul 14, 2026
djsly
reviewed
Jul 14, 2026
| - uses: bufbuild/buf-action@v1 | ||
| with: | ||
| input: aks-node-controller | ||
| version: 1.71.0 |
Collaborator
There was a problem hiding this comment.
would there be an easy way to turn this into a constant. it would be preferable to have it aligned between both locations.
Aligns local `make proto-generate` formatting output with the CI buf-action which uses the latest buf version. This prevents format drift where local buf 1.47.2 produces 5-space indentation in proto comments while CI expects 3-space indentation.
abigailliang-aks-sig-node
force-pushed
the
fix/pin-buf-version-in-ci
branch
from
51c0d00 to
00c6253
Compare
Comment on lines
+22
to
+24
| - name: Extract buf version from Makefile | ||
| id: buf-version | ||
| run: echo "version=$(grep '^BUF_VERSION' aks-node-controller/Makefile | cut -d'=' -f2 | tr -d ' ')" >> "$GITHUB_OUTPUT" |
| runs-on: ubuntu-24.04 | ||
| steps: | ||
| - uses: actions/checkout@v7 | ||
| - name: Extract buf version from Makefile |
Contributor
There was a problem hiding this comment.
might be better to store pinned version in a separate file under /aks-node-controller/ that we can reference from here and the Makefile?
cameronmeissner
approved these changes
Jul 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
While working on PR #8812 (remove
streamingConnectionIdleTimeoutfor k8s >= 1.34), I ranmake proto-generateto regeneratekubelet_config.pb.goafter marking the proto field as[deprecated = true]. This produced a 241-line formatting diff — the localbuf format(v1.47.2 pinned in the Makefile) reformatted all/* */comment blocks from 3-space to 5-space indentation.CI uses
bufbuild/buf-action@v1which pulls the latest buf version. The latest buf (1.71.0) expects 3-space indentation (matching what's already on main), so the locally-generated 5-space format fails CI's format check.Root cause: Version drift between the Makefile (
bufbuild/buf:1.47.2) and CI (bufbuild/buf-action@v1→ unpinned latest).Fix:
buf-actiontoversion: 1.71.0so both local and CI use the same versionThis ensures
make proto-generatelocally and CI produce identical formatting. Future buf upgrades require changing both files together.Changes
aks-node-controller/Makefile:bufbuild/buf:1.47.2→bufbuild/buf:1.71.0.github/workflows/buf.yaml: addversion: 1.71.0to pin CITest plan
docker run bufbuild/buf:1.71.0 format --diffon main produces no outputmake proto-generatewith 1.71.0 does not change any proto file formatting on main