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

[v1.28] Rancher K8s v1.28.6 update #43652

Merged
merged 7 commits into from
Feb 16, 2024
Merged

[v1.28] Rancher K8s v1.28.6 update #43652

merged 7 commits into from
Feb 16, 2024

Conversation

chiukapoor
Copy link
Contributor

@chiukapoor chiukapoor commented Nov 30, 2023 •
edited

Issue

Problem

  • To support Kubernetes 1.28 we need to bump all the k8s libraries to 1.28.

Solution

TODO

  • Update k3s to Jan patches once available.

Testing

  • 1.28 RKE2, RKE1 and k3s clusters with forked dependencies.
    image

  • Example nginx deployment on 1.28 RKE2, RKE1 and k3s clusters with forked dependencies.
    Screenshot from 2023-11-30 12-53-27
    Screenshot from 2023-11-30 12-53-31
    Screenshot from 2023-11-30 12-53-34

  • Update from 1.27.6 to 1.28.2 on RKE2, RKE1 and k3s clusters with forked dependencies.
    image
    image

Engineering Testing

Manual Testing

Automated Testing

  • Test types added/modified:
    • Unit
    • Integration (Go Framework)
    • Integration (v2prov Framework)
    • Validation (Go Framework)
    • Other - Explain: EXPLAIN
    • None
    • REMOVE NOT APPLICABLE BULLET POINTS ABOVE
  • If "None" - Reason: EXPLAIN THE REASON
  • If "None" - GH Issue/PR: LINK TO GH ISSUE/PR TO ADD TESTS

Summary: TODO

QA Testing Considerations

Regressions Considerations

TODO

Existing / newly added automated tests that provide evidence there are no regressions:

  • TODO

@chiukapoor chiukapoor changed the title Rancher K8s v1.28.2 Update [WIP] Rancher K8s v1.28.2 Update Nov 30, 2023
@chiukapoor chiukapoor mentioned this pull request Nov 30, 2023
Closed
26 tasks
@vardhaman22 vardhaman22 force-pushed the rancher-v1.28.2 branch 5 times, most recently from 99ff93e to 69e440a Compare December 29, 2023 03:09
@chiukapoor
Copy link
Contributor Author

chiukapoor commented Jan 8, 2024 •
edited

Rebased with release/v2.8

@chiukapoor chiukapoor force-pushed the rancher-v1.28.2 branch 9 times, most recently from 73e2ba3 to bfde190 Compare January 17, 2024 15:38
@chiukapoor
Copy link
Contributor Author

chiukapoor commented Jan 17, 2024 •
edited

Rebased with release/v2.8 to inculcate blocking changes from #42406

@chiukapoor chiukapoor mentioned this pull request Jan 22, 2024
Closed
@chiukapoor chiukapoor force-pushed the rancher-v1.28.2 branch 6 times, most recently from d0fd0b6 to dd164f7 Compare January 29, 2024 19:48
@chiukapoor chiukapoor changed the title [WIP] Rancher K8s v1.28.2 Update [WIP] [v1.28] Rancher K8s v1.28.6 update Jan 29, 2024
@mjura mjura mentioned this pull request Feb 2, 2024
Closed
19 tasks
mjura
mjura previously approved these changes Feb 7, 2024
View reviewed changes
kinarashah
kinarashah reviewed Feb 15, 2024
View reviewed changes
package/Dockerfile Outdated Show resolved Hide resolved
@kinarashah kinarashah requested a review from a team February 15, 2024 18:36
@kinarashah kinarashah changed the title [WIP] [v1.28] Rancher K8s v1.28.6 update [v1.28] Rancher K8s v1.28.6 update Feb 15, 2024
@chiukapoor chiukapoor force-pushed the rancher-v1.28.2 branch 2 times, most recently from 787ea2b to 0ad8627 Compare February 15, 2024 20:38
kinarashah
kinarashah previously approved these changes Feb 15, 2024
View reviewed changes
@kinarashah kinarashah requested a review from a team February 15, 2024 23:29
mjura
mjura previously approved these changes Feb 16, 2024
View reviewed changes
@chiukapoor
update wrangler to wrangler/v2
4a2f755 
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
@chiukapoor
go generate
b0375c3 
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
@chiukapoor
Update k3s and CATTLE_MACHINE_VERSION version in Docker and Jenkinsfile
ff52646 
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
@chiukapoor
Bump dependencies to support k8s v1.28.6
1f48a27 
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
0d7e552 
…8384]

Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
@chiukapoor
Implement EachListItemWithAlloc (kubernetes/kubernetes#113362) in moc…
a6c9425 
…kUnstructured struct

Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
@chiukapoor
go generate
699c6af 
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
@chiukapoor chiukapoor dismissed stale reviews from mjura and kinarashah via 699c6af February 16, 2024 09:59
jiaqiluo
jiaqiluo approved these changes Feb 16, 2024
View reviewed changes
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.

Good Job!
LGTM 💯

kinarashah
kinarashah approved these changes Feb 16, 2024
View reviewed changes
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.

Other changes LGTM, can update this in a separate PR if required.

package/Dockerfile
ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109
ENV CATTLE_K3S_VERSION v1.27.6+k3s1
ENV CATTLE_MACHINE_VERSION v0.15.0-rancher110
ENV CATTLE_K3S_VERSION v1.28.6+k3s2
ENV CATTLE_MACHINE_PROVISION_IMAGE rancher/machine:${CATTLE_MACHINE_VERSION}
ENV CATTLE_ETCD_VERSION v3.5.1
Copy link
Member

Choose a reason for hiding this comment

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

v1.28.6+k3s2 uses v3.5.9, so need to bump CATTLE_ETCD_VERSION https://github.com/k3s-io/k3s/releases/tag/v1.28.6+k3s2

tests/v2/codecoverage/package/Dockerfile
ENV CATTLE_MACHINE_VERSION v0.15.0-rancher109
ENV CATTLE_K3S_VERSION v1.27.6+k3s1
ENV CATTLE_MACHINE_VERSION v0.15.0-rancher110
ENV CATTLE_K3S_VERSION v1.28.6+k3s2
ENV CATTLE_MACHINE_PROVISION_IMAGE rancher/machine:${CATTLE_MACHINE_VERSION}
ENV CATTLE_ETCD_VERSION v3.5.1
Copy link
Member

Choose a reason for hiding this comment

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

Update to v3.5.9

@kinarashah
Copy link
Member

Merging this PR and will open follow-up PR to bump CATTLE_ETCD_VERSION.

@kinarashah kinarashah merged commit 61758c2 into rancher:release/v2.8 Feb 16, 2024
2 checks passed
@kinarashah kinarashah mentioned this pull request Feb 16, 2024
Merged
@MbolotSuse MbolotSuse mentioned this pull request Feb 21, 2024
Closed
@aruiz14 aruiz14 mentioned this pull request Mar 22, 2024
Merged
@enrichman enrichman mentioned this pull request Apr 10, 2024
Closed
@jiaqiluo jiaqiluo mentioned this pull request Apr 12, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jiaqiluo jiaqiluo jiaqiluo approved these changes

@kinarashah kinarashah kinarashah approved these changes

@mjura mjura Awaiting requested review from mjura

Assignees
No one assigned
Labels
None yet
Projects
CAPI & Hosted Kubernetes providers (EKS/AKS/GKE)
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@chiukapoor @mjura @kinarashah @jiaqiluo