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 aws-k8s-1.22, vmware-k8s-1.22, aws-k8s-1.22-nvidia, metal-k8s-1.22 variants #1962

Merged
merged 7 commits into from
Mar 7, 2022

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Feb 16, 2022

Issue number:
Resolves #1961

Description of changes:
For reference, the addition of k8s-1.21 variants was in #1612


    vmware-k8s-1.22: use unified layout for vmware-k8s-1.22
    
    Having two disks in the OVF template can trigger sporadic issues when
    importing into the vSphere content library. Switching to the unified
    layout should avoid this failure mode.
    
    Signed-off-by: Ben Cressey <bcressey@amazon.com>



    Add metal-k8s-1.22 variant
    
    This change adds an additional variant `metal-k8s-1.22`, which includes
    necessary Kubernetes packages and settings for running Bottlerocket on
    metal in a Kubernetes v1.22 cluster.

    Add aws-k8s-1.22-nvidia variant
    
    Adds aws-k8s-1.22-nvidia variant, create symlinks for previous k8s
    version nvidia variant in models.

    Add vmware-k8s-1.22 variant
    
    Adds vmware-k8s-1.22 variant, relinks symlinks in models

    Add aws-k8s-1.22 variant
    
    Adds aws-k8s-1.22 variant, relinks symlinks in models

    packages: add kubernetes-1.22
    
    Use K8s 1.22 source from EKS-D

Testing done:

  • Pods run OK
  • Conformance testing with 1.22 control plane and x86_64 aws-k8s-1.22 nodes
      "progress": {
        "name": "e2e",
        "node": "global",
        "timestamp": "2022-02-23T02:59:32.923164651Z",
        "msg": "Test Suite completed",
        "total": 346,
        "completed": 346
      }
  • Conformance testing with 1.22 control plane and aarch64 aws-k8s-1.22 nodes
  • Conformance testing with 1.22 control plane and x86_64 aws-k8s-1.22 nodes in an IPv6 cluster
  • Conformance testing with 1.22 control plane and x86_64 vmware-k8s-1.22 nodes
  • Confirm the EBS CSI driver still works.
  • Confirm the vSphere CSI driver still works
  • Smoke test aws-k8s-1.22-nvidia variant with some GPU workloads
  • Metal K8s 1.22 testing
  • Check kubelet logs and system logs in general, compared them with the aws-k8s-1.21 variant kubelet logs:

... Others TBD

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.

@etungsten etungsten changed the title Add k8s-1.22 variants Add aws-k8s-1.22, vmware-k8s-1.21 variants Feb 16, 2022
@etungsten etungsten changed the title Add aws-k8s-1.22, vmware-k8s-1.21 variants Add aws-k8s-1.22, vmware-k8s-1.22 variants Feb 16, 2022
@cbgbt

This comment was marked as resolved.

Copy link
Contributor

@cbgbt cbgbt left a comment

Choose a reason for hiding this comment

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

This looks good to me, pending testing.

@etungsten etungsten changed the title Add aws-k8s-1.22, vmware-k8s-1.22 variants Add aws-k8s-1.22, vmware-k8s-1.22, aws-k8s-1.22-nvidia variants Feb 18, 2022
@etungsten etungsten changed the title Add aws-k8s-1.22, vmware-k8s-1.22, aws-k8s-1.22-nvidia variants Add aws-k8s-1.22, vmware-k8s-1.22, aws-k8s-1.22-nvidia, metal-k8s-1.22 variants Feb 18, 2022
@etungsten etungsten force-pushed the k8s-1.22 branch 3 times, most recently from 7277052 to b498e83 Compare February 22, 2022 19:56
@bcressey
Copy link
Contributor

bcressey commented Mar 3, 2022

nit: commit for metal-k8s-1.22 says 1.21 in the subject

Copy link
Contributor

@bcressey bcressey left a comment

Choose a reason for hiding this comment

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

Nice work! I know there's a staggering amount of copy/paste and fiddly edits but it all looks right to me.

QUICKSTART-VMWARE.md Outdated Show resolved Hide resolved
sources/models/src/lib.rs Outdated Show resolved Hide resolved
@etungsten
Copy link
Contributor Author

Push above rebases onto develop to pull in latest changes.

@etungsten
Copy link
Contributor Author

Push above addresses @bcressey 's comments.

Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🏷️

@etungsten
Copy link
Contributor Author

Push above updates the k8s-1.22 package to the latest EKS-D dev release.

@etungsten
Copy link
Contributor Author

Push above rebases onto develop and fixes conflicts

Use K8s 1.22 source from EKS-D
Adds aws-k8s-1.22 variant, relinks symlinks in models
Adds vmware-k8s-1.22 variant, relinks symlinks in models
Update example vmware k8s version in quickstart to v1.21
Adds aws-k8s-1.22-nvidia variant, create symlinks for previous k8s
version nvidia variant in models.
This change adds an additional variant `metal-k8s-1.22`, which includes
necessary Kubernetes packages and settings for running Bottlerocket on
metal in a Kubernetes v1.22 cluster.
@etungsten
Copy link
Contributor Author

Push above flips the kubernetes-1.22 package to use the EKS-D prod release URL for its sources.

Having two disks in the OVF template can trigger sporadic issues when
importing into the vSphere content library. Switching to the unified
layout should avoid this failure mode.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
@etungsten
Copy link
Contributor Author

Push above adds a commit for changing the image layout for vmware-k8s-1.22 to unified.

Tested the vmware-k8s-1.22 variant and conformance tests passed.

@etungsten etungsten marked this pull request as ready for review March 7, 2022 20:36
@etungsten etungsten requested review from zmrow and bcressey March 7, 2022 20:47
QUICKSTART-VMWARE.md Outdated Show resolved Hide resolved
vmware-k8s variants have graduated from preview status.
@etungsten
Copy link
Contributor Author

Push above removes note about vmware variant's preview status from README and QUICKSTART-VMWARE.

Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🌡️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Kubernetes 1.22 support
5 participants