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

add k8s 1.26 variants #2771

Merged
merged 1 commit into from
Mar 8, 2023
Merged

Conversation

gthao313
Copy link
Member

@gthao313 gthao313 commented Feb 1, 2023

Issue number:

Closes #2770

Description of changes:

    add k8s 1.26 variants

    This adds a k8s-1.26 package. Existing 1.25 models are moved to be 1.26,
    with symlinks created for 1.25 models to point to the new locations.
    Finally, new variants are defined for aws-k8s-1.26, aws-k8s-1.26-nvidia,
    metal-k8s-1.26, and vmware-k8s-1.26.

Testing done:

To be done:

  • Update package with final EKS-D 1.26 package source
  • Test aws-k8s-1.26 x86_64 joining 1.26 cluster and ran full conformance test.
  • Test aws-k8s-1.26 ARM joining 1.26 cluster and deploying pods
  • Test aws-k8s-1.26-nvidia x86-64 joining 1.26 cluster and ran full conformance test
  • Test aws-k8s-1.26-nvidia ARM joining 1.26 cluster and ran full conformance test
  • Test metal-k8s-1.26 joining 1.25 cluster and ran full conformance test
  • Test vmware-k8s-1.26 joining 1.25 cluster and ran full conformance test
  • Check kubelet logs and system logs in general, compared them with the aws-k8s-1.25 variant kubelet logs.
  • Confirm the vSphere CSI driver still works
  • Confirm the EBS CSI driver still works.
  • Smoke test aws-k8s-1.26-nvidia variant with some GPU workloads

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@gthao313
Copy link
Member Author

gthao313 commented Feb 3, 2023

need update after merging #2774

@gthao313 gthao313 force-pushed the k8s-1.26 branch 2 times, most recently from cd31647 to 0d0a951 Compare February 24, 2023 18:32
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Just some questions and minor things inline. Looks good!

.github/workflows/build.yml Outdated Show resolved Hide resolved
packages/kubernetes-1.26/Cargo.toml Outdated Show resolved Hide resolved
variants/aws-k8s-1.26-nvidia/Cargo.toml Outdated Show resolved Hide resolved
variants/aws-k8s-1.26/Cargo.toml Outdated Show resolved Hide resolved
variants/metal-k8s-1.26/Cargo.toml Outdated Show resolved Hide resolved
variants/vmware-k8s-1.26/Cargo.toml Outdated Show resolved Hide resolved
@gthao313
Copy link
Member Author

gthao313 commented Mar 6, 2023

Blocked by EKS team that enable cluster-provider=external on ipv6.

@gthao313 gthao313 requested a review from stmcginnis March 6, 2023 22:21
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

This is looking great - thanks @gthao313!

packages/kubernetes-1.26/kubernetes-1.26.spec Outdated Show resolved Hide resolved
Copy link
Contributor

@jpmcb jpmcb left a comment

Choose a reason for hiding this comment

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

Built a aws-k8s-1.25 variant and deployed an ami

cargo make -e BUILDSYS_VARIANT=aws-k8s-1.26
...
cargo make -e BUILDSYS_VARIANT=aws-k8s-1.26 ami

👍🏼


%build
# Build codegen programs with the host toolchain.
make hack/update-codegen.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI to others since I was curious:

echo "'make generated_files' is deprecated. Please use hack/update-codegen.sh instead."

And looks like it'll be dropped in k8s 1.29
https://github.com/kubernetes/kubernetes/blob/2dae34c4a2768a8d39422be42eae2b2817a41a7c/build/root/Makefile#L311-L317

packages/kubernetes-1.26/kubernetes-1.26.spec Outdated Show resolved Hide resolved
This adds a k8s-1.26 package. Existing 1.25 models are moved to be 1.26,
with symlinks created for 1.25 models to point to the new locations.
Finally, new variants are defined for aws-k8s-1.26, aws-k8s-1.26-nvidia,
metal-k8s-1.26, and vmware-k8s-1.26.
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Looks good, thanks for getting the URL updated.

@gthao313 gthao313 merged commit a3c73a5 into bottlerocket-os:develop Mar 8, 2023
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.

Kubernetes 1.26 support
4 participants