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.

Sign up for GitHub

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

Jump to bottom

kubeadm: check the GV after the config migration #119075

Merged
merged 1 commit into from
Jul 5, 2023
Merged

kubeadm: check the GV after the config migration #119075

merged 1 commit into from
Jul 5, 2023

Conversation

chendave
Copy link
Member

@chendave chendave commented Jul 4, 2023

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

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

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 4, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Jul 4, 2023
@chendave
Copy link
Member Author

chendave commented Jul 4, 2023

/kind cleanup

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 4, 2023
@k8s-ci-robot k8s-ci-robot requested review from pacoxu and RA489 July 4, 2023 14:59
@chendave chendave mentioned this pull request Jul 4, 2023
Merged
@chendave
Copy link
Member Author

chendave commented Jul 4, 2023

/cc @neolit123

@k8s-ci-robot k8s-ci-robot requested a review from neolit123 July 4, 2023 15:01
neolit123
neolit123 reviewed Jul 4, 2023
View reviewed changes
cmd/kubeadm/app/util/config/common_test.go Outdated
}
for _, gvk := range gvks {
if gvk.GroupVersion().String() != expectedGV {
t.Fatalf("GV mismatch, expected GV: %s, got GV: %s", expectedGV, gvk.GroupVersion().String())
Copy link
Member

@neolit123 neolit123 Jul 4, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
t.Fatalf("GV mismatch, expected GV: %s, got GV: %s", expectedGV, gvk.GroupVersion().String())
t.Errorf("GV mismatch, expected GV: %s, got GV: %s", expectedGV, gvk.GroupVersion().String())

to print all of them (if there are > 1)

EDIT: but technically doesn't matter much because we only test for the kubeadm GV.

Copy link
Member

@neolit123 neolit123 Jul 4, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

EDIT2: we do test e.g. kubelet kinds as well so the above suggestion makes sense

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 4, 2023
@neolit123
Copy link
Member

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2023
@neolit123
Copy link
Member

/lgtm cancel

actually see my comment above ^

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 4, 2023
@k8s-ci-robot k8s-ci-robot requested a review from neolit123 July 4, 2023 16:01
@chendave
kubeadm: check the GV after the config migration
31943cc 
Signed-off-by: Dave Chen <dave.chen@arm.com>
@k8s-ci-robot k8s-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 5, 2023
@pacoxu
Copy link
Member

pacoxu commented Jul 5, 2023

It will fail without the fix in #119059 like below.

--- FAIL: TestMigrateOldConfig (17.94s)
    --- FAIL: TestMigrateOldConfig/ClusterConfiguration_gets_migrated_from_experimental_API (2.10s)
        /Users/pacoxu/git/gopath/src/k8s.io/kubernetes/cmd/kubeadm/app/util/config/common_test.go:460: GV mismatch, expected GV: kubeadm.k8s.io/v1beta4, got GV: kubeadm.k8s.io/v1beta3
        /Users/pacoxu/git/gopath/src/k8s.io/kubernetes/cmd/kubeadm/app/util/config/common_test.go:460: GV mismatch, expected GV: kubeadm.k8s.io/v1beta4, got GV: kubeadm.k8s.io/v1beta3
FAIL
FAIL	k8s.io/kubernetes/cmd/kubeadm/app/util/config	18.767s

/lgtm

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

LGTM label has been added.

Git tree hash: da83a2a9dc924be9a829c5df339c85f11046d56d

neolit123
neolit123 reviewed Jul 5, 2023
View reviewed changes
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.

/hold cancel
/approve
/lgtm
thanks

@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 Jul 5, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chendave, 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 Jul 5, 2023
@k8s-ci-robot k8s-ci-robot merged commit 4c18d40 into kubernetes:master Jul 5, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Jul 5, 2023
@chendave chendave deleted the test_gv branch July 5, 2023 05:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@pacoxu pacoxu Awaiting requested review from pacoxu

@RA489 RA489 Awaiting requested review from RA489

Assignees

@neolit123 neolit123

@pacoxu pacoxu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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. release-note-none Denotes a PR that doesn't merit a release note. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.
4 participants
@chendave @k8s-ci-robot @neolit123 @pacoxu