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

Remove kubernetes 1.21 variants #2700

Merged
merged 1 commit into from
Feb 28, 2023

Conversation

stmcginnis
Copy link
Contributor

Issue number:

Closes #2633

Description of changes:

This removes the 1.21 k8s variants. This version of Kubernetes has gone end of life and we will no longer support it.

Docs and other references to 1.21 have been updated to refer to more current versions.

Note to reviewers

See #2421 and #2316 for examples of past removals of k8s version variants.

Testing done:

cargo make -e BUILDSYS_VARIANT=aws-k8s-1.22 -e BUILDSYS_ARCH=x86_64

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.

@stmcginnis stmcginnis marked this pull request as draft January 5, 2023 19:11
@stmcginnis
Copy link
Contributor Author

Should be ready to review, but marking as draft as we don't want to merge this until we are ready for the next release after the February EOL date.

@stmcginnis stmcginnis marked this pull request as ready for review January 24, 2023 15:57
README.md Outdated Show resolved Hide resolved
sources/bottlerocket-variant/src/lib.rs Show resolved Hide resolved
@stmcginnis
Copy link
Contributor Author

Rebased on the latest from develop and updated wording for removed variants in the README.

Copy link
Member

@gthao313 gthao313 left a comment

Choose a reason for hiding this comment

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

🚀

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.

Looks great - noticed this odd referenced to a 1.21 k8s variant in some test:

https://github.com/stmcginnis/bottlerocket/blob/remove-k8s-1.21/sources/bottlerocket-variant/src/lib.rs#L385-L392

        Test {
            input: "aws-k8s-1.21",
            platform: "aws",
            runtime: "k8s",
            variant_family: "aws-k8s",
            variant_version: Some("1.21"),
            variant_flavor: None,
        },

worth also updating that?

@stmcginnis
Copy link
Contributor Author

Looks great - noticed this odd referenced to a 1.21 k8s variant in some test:

https://github.com/stmcginnis/bottlerocket/blob/remove-k8s-1.21/sources/bottlerocket-variant/src/lib.rs#L385-L392

        Test {
            input: "aws-k8s-1.21",
            platform: "aws",
            runtime: "k8s",
            variant_family: "aws-k8s",
            variant_version: Some("1.21"),
            variant_flavor: None,
        },

worth also updating that?

I almost did that, but decided I didn't want to set the precedent that we need to remember to bump this every time we raise the minimum k8s version.

Since in this case it is just used as test input and has no actual meaning, it may actually be better to have this refer to a variant that doesn't currently exist to help make it clear that it is just dummy test data.

@stmcginnis
Copy link
Contributor Author

Switching back over to draft status until everyone is comfortable that we actually can drop 1.21.

@stmcginnis stmcginnis marked this pull request as draft January 31, 2023 04:04
@stmcginnis stmcginnis marked this pull request as ready for review February 28, 2023 22:22
This removes the 1.21 k8s variants. This version of Kubernetes has gone
end of life and we will no longer support it.

Docs and other references to 1.21 have been updated to refer to more
current versions.

Signed-off-by: Sean McGinnis <[email protected]>
@stmcginnis stmcginnis merged commit 9441548 into bottlerocket-os:develop Feb 28, 2023
@stmcginnis stmcginnis deleted the remove-k8s-1.21 branch February 28, 2023 23:05
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.

Remove K8s 1.21 variants by February 2023
6 participants