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.21, vmware-k8s-1.21 variants #1612

Merged
merged 3 commits into from
Jun 21, 2021

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Jun 15, 2021

Issue number:
#1611

Description of changes:

For reference, the addition of aws-k8s-1.20 was in #1437.

Version of kubelet packaged: v1.21.2

Author: Erikson Tung <etung@amazon.com>
Date:   Tue Jun 15 11:31:57 2021 -0700

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

Author: Erikson Tung <etung@amazon.com>
Date:   Tue Jun 15 11:55:19 2021 -0700

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

Author: Erikson Tung <etung@amazon.com>
Date:   Tue Jun 15 11:30:21 2021 -0700

    packages: add kubernetes-1.21
    
    * No longer need '0001-always-set-relevant-variables-for-cross-compiling.patch'
    * Third party package 'github.com/miekg/dns' version bump included some
    changes in its license file so the hash changed. The license is still
    'BSD-3-Clause'.

0001-always-set-relevant-variables-for-cross-compiling.patch is no longer needed as a result of the following changes in 1.21:

Testing done:

  • Pods run OK

  • Conformance testing with 1.21 control plane and x86_64 aws-k8s-1.21 nodes

  • Conformance testing with 1.21 control plane and aarch64 aws-k8s-1.21 nodes

  • Conformance testing with 1.21 control plane and x86_64 vmware-k8s-1.21 nodes

  • Confirm the EBS CSI driver still works.

  • Confirm the vSphere CSI driver still works - (Block volumes only since file volumes are not yet supported on AWS VMC)

  • Check kubelet logs and system logs in general, compared them with the aws-k8s-1.20 variant kubelet logs:

There's a new kubelet warning during start up:

Flag --network-plugin has been deprecated, will be removed along with dockershim.

dockershim for kubelet will be fully deprecated by 1.23 which I believe we'll have to address separately at some point.

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 linked an issue Jun 15, 2021 that may be closed by this pull request
@etungsten etungsten removed a link to an issue Jun 15, 2021
@etungsten etungsten changed the title Add aws-k8s-1.21 variant Add aws-k8s-1.21, vmware-k8s-1.21 variants Jun 15, 2021
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.

LGTM pending testing.

packages/kubernetes-1.21/kubernetes-1.21.spec Show resolved Hide resolved
packages/kubernetes-1.21/kubelet.service Show resolved Hide resolved
@etungsten
Copy link
Contributor Author

Push above separates the commits into 3, first one adds the kubernetes-1.21 package, one that adds the aws-k8s-1.21 variant, and one that adds the vmware-k8s-variant.

@etungsten
Copy link
Contributor Author

Push above adds some clarifying comments about kube_cc in kubernetes-1.21.spec

@etungsten etungsten linked an issue Jun 15, 2021 that may be closed by this pull request
README.md Outdated Show resolved Hide resolved
variants/vmware-k8s-1.21/Cargo.toml Show resolved Hide resolved
variants/vmware-k8s-1.21/Cargo.toml Show resolved Hide resolved
@etungsten
Copy link
Contributor Author

Push above rebases onto develop

@etungsten
Copy link
Contributor Author

Push above addresses comments from @tjkirch

@etungsten
Copy link
Contributor Author

Updated PR description to include testing for vsphere conformance testing, vsphere csi driver testing against a 1.21 cluster control plane.

@etungsten etungsten marked this pull request as ready for review June 15, 2021 21:25
@etungsten
Copy link
Contributor Author

etungsten commented Jun 16, 2021

Github actions is consistently failing checks. I added three more jobs as part of this PR. There are now a total of 18 jobs to run per PR. It seems like one or two of the jobs always times out for some reason.

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

etungsten commented Jun 17, 2021

v1.21.2 just got released. I'll update the packaged kubelet version soon.

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.

LGTM, assuming 1.21.2 was retested.

@etungsten
Copy link
Contributor Author

Push above updates kubelet to v1.21.2. Pods run fine.

Build checks keep failing due to network timeouts etc. Failures are not related to the changes.

* No longer need '0001-always-set-relevant-variables-for-cross-compiling.patch'
* Third party package 'github.com/miekg/dns' version bump included some
changes in its license file so the hash changed. The license is still
'BSD-3-Clause'.
Adds aws-k8s-1.21 variant, relinks symlinks in models
Adds vmware-k8s-1.21 variant, relinks symlinks in models
@etungsten
Copy link
Contributor Author

Rebases onto develop to bring in the commit that fixes CI.

@tjkirch tjkirch added this to the next milestone Jun 21, 2021
@etungsten etungsten merged commit 17c7f67 into bottlerocket-os:develop Jun 21, 2021
@etungsten etungsten deleted the k8s-1.21 branch June 21, 2021 22:22
@bcressey bcressey mentioned this pull request Sep 29, 2021
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.21 support
5 participants