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

[Forwardport] [v2.9] Rancher k8s v1.28.6 update #45082

Merged
merged 8 commits into from
Apr 23, 2024

Conversation

chiukapoor
Copy link
Contributor

@chiukapoor chiukapoor commented Apr 10, 2024

Issue

Updates

@chiukapoor chiukapoor marked this pull request as ready for review April 12, 2024 04:38
@snasovich snasovich requested a review from a team April 12, 2024 15:57
jiaqiluo
jiaqiluo previously approved these changes Apr 12, 2024
Copy link
Member

@jiaqiluo jiaqiluo left a comment

Choose a reason for hiding this comment

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

It looks like some changes in the original PR have been in the release/v2.9 branch, and this PR covers the part that are not. Also, the etcd version in the release/v2.9 branch is v3.5.12 which is higher than v3.5.9 that is used in the upstream v1.28.6+k3s2, which should be ok.

kinarashah
kinarashah previously approved these changes Apr 16, 2024
Copy link
Member

@kinarashah kinarashah left a comment

Choose a reason for hiding this comment

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

Need to rebase and update kdm + rke, but rest LGTM. Will reapprove before merge.

@chiukapoor chiukapoor dismissed stale reviews from kinarashah and jiaqiluo via a02ee77 April 17, 2024 10:42
@chiukapoor chiukapoor force-pushed the 1.28-in-2.9 branch 5 times, most recently from 36c9d47 to 43429a4 Compare April 18, 2024 10:10
@chiukapoor
Copy link
Contributor Author

chiukapoor commented Apr 18, 2024

Successfully tested k8s v1.28.8 downstream cluster deployment on rancher v2.9
image

@chiukapoor
Copy link
Contributor Author

chiukapoor commented Apr 18, 2024

It seems like the CI is failing after the rancher/ui-plugin-examples#38 was merged. I tried to fix it in e398e5d but no success.

EDIT: The issue is being tracked here #45159

jiaqiluo
jiaqiluo previously approved these changes Apr 18, 2024
jiaqiluo
jiaqiluo previously approved these changes Apr 19, 2024
…e and Jenkinsfile

Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
bump machine to v0.15.0-rancher110
bump client-go to v1.28.6-rancher1

Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
…etes#118384]

Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
…kUnstructured struct

Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
* rke to 1.6.0-rc1
* kdm to dev-v2.9
* cli version to v2.9.0-rc1
* rancher-agent to v2.9

Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
Copy link
Collaborator

@snasovich snasovich left a comment

Choose a reason for hiding this comment

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

Changes look sane to me and given previous approval by @kinarashah and now @jiaqiluo it's good to merge.

@chiukapoor chiukapoor merged commit c4b890e into rancher:release/v2.9 Apr 23, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Forwardport v2.9] Add endpointslice dependency
4 participants