Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore honoring --version build ID overrides #126665

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Aug 13, 2024

What type of PR is this?

/kind bug
/kind regression

What this PR does / why we need it:

Minimal fix to restore honoring --version build ID overrides for 1.31

Added a simple test around the behavior at the start of test-cmd, where we're starting a real built API server

Which issue(s) this PR fixes:

Fixes #126663

Does this PR introduce a user-facing change?

kube-apiserver: Fixes a 1.31 regression that stopped honoring build ID overrides with the --version flag

/sig api-machinery
/assign @jpbetz
/hold for tests

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver labels Aug 13, 2024
@liggitt
Copy link
Member Author

liggitt commented Aug 13, 2024

/retest

@liggitt liggitt changed the title WIP - Restore honoring --version build ID overrides Restore honoring --version build ID overrides Aug 14, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 14, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt

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:

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

@liggitt
Copy link
Member Author

liggitt commented Aug 14, 2024

+++ [0814 00:59:07] On try 4, apiserver: ok
Successful
�(Bmessage:{
  "major": "1",
  "minor": "32",
  "gitVersion": "v1.32.0-alpha.0.34+67202bdb1d4932-custom",
  "gitCommit": "67202bdb1d49321b05481461725b326a072960b8",
  "gitTreeState": "clean",
  "buildDate": "2024-08-13T21:44:43Z",
  "goVersion": "go1.22.5",
  "compiler": "gc",
  "platform": "linux/amd64"
}
has:gitVersion.*-custom

test passed

@liggitt
Copy link
Member Author

liggitt commented Aug 14, 2024

/hold cancel

This will need revisiting if we actually start letting people override the binary version (I'm not sure if that's planned or not), but this is a minimal version to resolve the regression for 1.31

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 14, 2024
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

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

LGTM label has been added.

Git tree hash: e372f454319f7f7ccad42f5a3d7fb1c8ca07d734

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 14, 2024
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
[discussed shellcheck fix, see diff link above in "compare" button]

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

LGTM label has been added.

Git tree hash: a6fceb3bd5e09b67f0333bef9b022f6ab48ed61d

@liggitt
Copy link
Member Author

liggitt commented Aug 14, 2024

/priority important-soon
/triage accepted

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 14, 2024
@k8s-ci-robot k8s-ci-robot merged commit 69dbf2e into kubernetes:master Aug 14, 2024
14 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.32 milestone Aug 14, 2024
k8s-ci-robot added a commit that referenced this pull request Aug 15, 2024
…665-upstream-release-1.31

Automated cherry pick of #126665: Restore honoring --version build ID overrides
@liggitt liggitt deleted the version-build-id branch December 13, 2024 12:49
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/apiserver cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kube-apiserver and other components no longer honor --version build ID overrides
4 participants