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 a vmware-k8s-1.20 variant #1511

Merged
merged 1 commit into from
May 3, 2021
Merged

Conversation

zmrow
Copy link
Contributor

@zmrow zmrow commented Apr 21, 2021

Issue number:
Closes #1451

Description of changes:
This change adds the necessary files for a VMware Kubernetes 1.20 variant.

This variant is currently able to join Kubernetes clusters on VMware given the proper user data.

Testing done:
All nodes used the following user data:

[settings.kubernetes]
api-server = "<redacted>"
cluster-dns-ip = "<redacted>"
bootstrap-token = "<redacted>"
cluster-certificate = "abc123"

[settings.host-containers.admin]
enabled=true
user-data = "<redacted>"

[settings.host-containers.control]
enabled = true
user-data= "<redacted>"

Built a vmware-k8s-1.20 OVA and uploaded to vSphere. Booted 3 nodes using the above user-data via guestinfo.userdata. The nodes boot and properly join a previously provisioned CAPV cluster.

  • Ensure that vmtoolsd is running and green
  • All taints are removed and hosts are schedulable. All cluster pods running successfully on the nodes (calico, vsphere-csi, etc)
  • Run a busybox pod
  • Inspected journal logs; nothing alarming there
  • Host containers work normally
    • SSH to the node's IP address to ensure that admin container works. sudo sheltie works as normal
    • Use SSM to start a session on the control container. Everything works as normal
  • Sonobuoy testing passed.
Plugin: e2e
Status: passed
Total: 5667
Passed: 309
Failed: 0
Skipped: 5358

Plugin: systemd-logs
Status: passed
Total: 4
Passed: 4
Failed: 0
Skipped: 0

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.

@zmrow
Copy link
Contributor Author

zmrow commented Apr 22, 2021

^ Fix the Cargo.lock... oops :)

@zmrow
Copy link
Contributor Author

zmrow commented Apr 23, 2021

  • Rebased on develop (sorry this rebase should have been in a different push to make the diff easier to read)
  • Added supported_arches and kernel-parameters
  • Removed static-pods

Copy link
Contributor

@webern webern left a comment

Choose a reason for hiding this comment

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

🍰

packages/os/os.spec Show resolved Hide resolved
variants/README.md Outdated Show resolved Hide resolved
variants/README.md Show resolved Hide resolved
variants/vmware-k8s-1.19/Cargo.toml Outdated Show resolved Hide resolved
.github/workflows/build.yml Show resolved Hide resolved
packages/containerd/containerd-config-toml_vmware-k8s Outdated Show resolved Hide resolved
packages/os/os.spec Outdated Show resolved Hide resolved
packages/os/os.spec Show resolved Hide resolved
@zmrow zmrow changed the title Add a vmware-k8s-1.19 variant Add a vmware-k8s-1.20 variant Apr 28, 2021
@zmrow
Copy link
Contributor Author

zmrow commented Apr 28, 2021

Updated to use K8s 1.20 and integrated all the requested feedback.

#1510 is being worked by @bcressey separately and will have a separate PR to merge into this variant.

Marked this PR as ready for review.

@zmrow zmrow marked this pull request as ready for review April 28, 2021 22:25
Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

I'm working on the config refactors for #1511 (comment) and #1511 (comment).

sources/models/shared-defaults/vmware-host-containers.toml Outdated Show resolved Hide resolved
sources/models/shared-defaults/vmware-host-containers.toml Outdated Show resolved Hide resolved
variants/README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
@zmrow
Copy link
Contributor Author

zmrow commented Apr 29, 2021

^ Addresses @tjkirch 's comments

@zmrow
Copy link
Contributor Author

zmrow commented Apr 30, 2021

^ rebase on develop, no changes.

@zmrow
Copy link
Contributor Author

zmrow commented Apr 30, 2021

^ Adds the kernel to Cargo.toml and updates Cargo.lock

@tjkirch tjkirch reopened this Apr 30, 2021
@tjkirch
Copy link
Contributor

tjkirch commented Apr 30, 2021

^ Wow, sorry. I thought I was being funny by saying my PR would resolve a comment in this PR, but it closed the whole PR. Reopened!

@zmrow
Copy link
Contributor Author

zmrow commented May 3, 2021

^ rebase on develop, no changes (yet)

@zmrow
Copy link
Contributor Author

zmrow commented May 3, 2021

^ Yet another rebase on develop, no changes (yet)

This change adds the necessary files for a VMware Kubernetes 1.20
variant.
@zmrow
Copy link
Contributor Author

zmrow commented May 3, 2021

^ Addressed all the changes necessary after rebase and addressed remaining PR comments!

@zmrow zmrow requested review from webern and etungsten May 3, 2021 20:25
@zmrow zmrow merged commit 35afe6b into bottlerocket-os:develop May 3, 2021
@zmrow zmrow deleted the vmware-k8s-bak branch May 3, 2021 21:38
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.

Add a vmware-k8s-1.x variant
5 participants