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

bump k8s version to 1.23.15 #4509

Merged
merged 8 commits into from
Jan 16, 2023
Merged

bump k8s version to 1.23.15 #4509

merged 8 commits into from
Jan 16, 2023

Conversation

Shelley-BaoYue
Copy link
Collaborator

@Shelley-BaoYue Shelley-BaoYue commented Dec 17, 2022 •
edited

What type of PR is this?

/kind feature

What this PR does / why we need it:

bump k8s version to 1.23.15. #4483

Note: the runtime default change to containerd.

@kubeedge-bot kubeedge-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/feature Categorizes issue or PR as related to a new feature. labels Dec 17, 2022
@kubeedge-bot kubeedge-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 17, 2022
@Shelley-BaoYue Shelley-BaoYue changed the title WIP bump k8s version to 1.23.14 WIP bump k8s version to 1.23.15 Dec 20, 2022
@Shelley-BaoYue Shelley-BaoYue force-pushed the k8s-v1.23.15 branch 3 times, most recently from 95f88f2 to d9de0e1 Compare December 20, 2022 07:05
@Shelley-BaoYue
Copy link
Collaborator Author

need #4427 merged to solve the ci error of image build, because k8s 1.23 version requires go1.17 or greater.

@kubeedge-bot kubeedge-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 21, 2022
@gy95 gy95 mentioned this pull request Jan 6, 2023
Merged
@Shelley-BaoYue Shelley-BaoYue force-pushed the k8s-v1.23.15 branch 2 times, most recently from 1f2dc50 to 3846ed4 Compare January 6, 2023 08:48
@kubeedge-bot kubeedge-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 6, 2023
@Shelley-BaoYue
Copy link
Collaborator Author

ci error need merge #4533 first.

@gy95 gy95 mentioned this pull request Jan 6, 2023
Merged
@Shelley-BaoYue Shelley-BaoYue changed the title WIP bump k8s version to 1.23.15 bump k8s version to 1.23.15 Jan 9, 2023
@kubeedge-bot kubeedge-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 9, 2023
@Shelley-BaoYue Shelley-BaoYue added this to the v1.13 milestone Jan 9, 2023
wackxu
wackxu reviewed Jan 13, 2023
View reviewed changes
edge/pkg/edged/edged.go Outdated
// The parameter `registerNode` has been migrated to Kubelet Configuration.
// `registerNode` in KubeletFlag will be retained for next version(1.13), and removed in 1.14 and later.
if edgedconfig.Config.TailoredKubeletConfig.RegisterNode == utilpointer.BoolPtr(false) {
kubeConfig.RegisterNode = false
Copy link
Collaborator

Choose a reason for hiding this comment

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

The kubeConfig variable name is confusing， suggest rename to kubeletConfig

Copy link
Collaborator

Choose a reason for hiding this comment

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

if #4485 got merged, can we put this convert to ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The kubeConfig variable name is confusing， suggest rename to kubeletConfig

fixed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

if #4485 got merged, can we put this convert to ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration

Yes, but if we put in the convert function, we need change the convert funtion input parameters with flag. I think it's better to put it here and remove it next version.

@Shelley-BaoYue Shelley-BaoYue force-pushed the k8s-v1.23.15 branch 2 times, most recently from a682168 to 6600951 Compare January 14, 2023 13:39
@kubeedge-bot kubeedge-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2023
@kubeedge-bot kubeedge-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2023
@Shelley-BaoYue Shelley-BaoYue force-pushed the k8s-v1.23.15 branch 2 times, most recently from 4af90ce to 3b1c1bb Compare January 16, 2023 13:44
@kubeedge-bot kubeedge-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2023
@fisherxu fisherxu closed this Jan 16, 2023
@fisherxu fisherxu reopened this Jan 16, 2023
@Shelley-BaoYue
bump k8s version to 1.23.15
45b44f8 
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
@Shelley-BaoYue
bump controller-runtime version to 0.11.2
9e211f7 
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
@Shelley-BaoYue
modification for k8s 1.23.15
e10f4d1 
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
@Shelley-BaoYue
modification config for k8s-1.23
3604e46 
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
@Shelley-BaoYue
update version info
c0bd055 
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
@Shelley-BaoYue
bugfix prober not work
9c698c6 
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
@fisherxu fisherxu closed this Jan 16, 2023
@fisherxu fisherxu reopened this Jan 16, 2023
@Shelley-BaoYue
bump kind version to 0.17.0
231e94f 
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
@Shelley-BaoYue
modification for kubelet flag
2329cf8 
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
@fisherxu
Copy link
Member

/lgtm

@kubeedge-bot kubeedge-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2023
@fisherxu
Copy link
Member

/approve

@kubeedge-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fisherxu

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

@kubeedge-bot kubeedge-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2023
@kubeedge-bot kubeedge-bot merged commit 0df0dfe into kubeedge:master Jan 16, 2023
@kevin-wangzefeng kevin-wangzefeng mentioned this pull request Jan 28, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fisherxu fisherxu fisherxu left review comments

@wackxu wackxu wackxu left review comments

@gy95 gy95 gy95 left review comments

@kevin-wangzefeng kevin-wangzefeng Awaiting requested review from kevin-wangzefeng

@sids-b sids-b Awaiting requested review from sids-b

@zhu733756 zhu733756 Awaiting requested review from zhu733756

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.13
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Shelley-BaoYue @fisherxu @kubeedge-bot @wackxu @gy95