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

kubeadm: get k8s CI version markers from k8s infra bucket #98836

Merged
merged 2 commits into from Feb 6, 2021

Conversation

hasheddan
Copy link
Contributor

@hasheddan hasheddan commented Feb 6, 2021

What type of PR is this?

/kind bug

What this PR does / why we need it:

Updates kubeadm version resolution to use kubernetes community infra
bucket to fetch appropriate k8s ci versions. The images are already
being pulled from the kubernetes community infra bucket meaning that a
mismatch can occur when the ci version is fetched from the google infra
bucket and the image is not yet present on k8s infra.

Follow-up to #97087

Signed-off-by: hasheddan georgedanielmangum@gmail.com

Which issue(s) this PR fixes:

xref #98646

Special notes for your reviewer:

This should likely be CP'ed back to 1.20 branch as well.

Context: https://kubernetes.slack.com/archives/C09QZ4DQB/p1612269558032700

/priority critical-urgent
/sig release

/assign @neolit123
/cc @justaugustus @saschagrunert

Does this PR introduce a user-facing change?:

kubeadm: get k8s CI version markers from k8s infra bucket

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


Updates kubeadm version resolution to use kubernetes community infra
bucket to fetch appropriate k8s ci versions. The images are already
being pulled from the kubernetes community infra bucket meaning that a
mismatch can occur when the ci version is fetched from the google infra
bucket and the image is not yet present on k8s infra.

Follow-up to kubernetes#97087

Signed-off-by: hasheddan <georgedanielmangum@gmail.com>
The k8s release bucket constant is not longer overriden in network tests
because the fetcher is mocked rather than using httptest.NewServer. See
previous implementation in
https://github.com/kubernetes/kubernetes/pull/49119/files#diff-82f2b09991047d4a1884d53dedadd64a473d5c4dc75293514e71773ceedf08e2R128

Signed-off-by: hasheddan <georgedanielmangum@gmail.com>
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. labels Feb 6, 2021
@k8s-ci-robot k8s-ci-robot added sig/release Categorizes an issue or PR as relevant to SIG Release. 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. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Feb 6, 2021
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

SGTM, if we are applying this it also must be backported in the support skew.
@hasheddan are you willing to send the cherry picks?

/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 Feb 6, 2021
@neolit123
Copy link
Member

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 6, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hasheddan, neolit123

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 6, 2021
@hasheddan
Copy link
Contributor Author

@hasheddan are you willing to send the cherry picks?

@neolit123 absolutely :)

@hasheddan
Copy link
Contributor Author

/retest

@neolit123
Copy link
Member

IIRC a release note must be added here, which will make it not required on the cherry picks.
e.g. the title is OK for this:

kubeadm: get k8s CI version markers from k8s infra bucket

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Feb 6, 2021
@hasheddan
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 5fa704c into kubernetes:master Feb 6, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Feb 6, 2021
@justaugustus
Copy link
Member

Thanks Dan!
/area release-eng

@k8s-ci-robot k8s-ci-robot added the area/release-eng Issues or PRs related to the Release Engineering subproject label Feb 6, 2021
k8s-ci-robot added a commit that referenced this pull request Feb 8, 2021
…836-upstream-release-1.19

Automated cherry pick of #98836: kubeadm: get k8s CI version markers from k8s infra bucket
k8s-ci-robot added a commit that referenced this pull request Feb 8, 2021
…836-upstream-release-1.20

Automated cherry pick of #98836: kubeadm: get k8s CI version markers from k8s infra bucket
k8s-ci-robot added a commit that referenced this pull request Feb 8, 2021
…836-upstream-release-1.18

Automated cherry pick of #98836: kubeadm: get k8s CI version markers from k8s infra bucket
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/kubeadm area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/release Categorizes an issue or PR as relevant to SIG Release. size/S Denotes a PR that changes 10-29 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.

None yet

4 participants