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.30 package and variants boilerplate #3859

Merged
merged 1 commit into from
Mar 29, 2024

Conversation

ginglis13
Copy link
Contributor

Issue number:

Closes #

Description of changes:

Adds boiler plate for k8s-1.30 variants based on previous addition of k8s variants. This commit does not add the actual k8s-1.30 sources, but rather sets the stage for incremental changes to k8s-1.30 variants.

This adds a k8s-1.30 package. Existing 1.29 models are moved to be 1.30, with symlinks created for 1.29 models to point to the new locations. For now, the k8s-1.30 package points to the k8s-1.29 source.

Testing done:

No testing other than cargo make -e BUILDSYS_VARIANT=aws-k8s-1.30, just boilerplate. PR to add real k8s-1.30 sources will include full testing.

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.

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.

LGTM. I'd be happy to see this merged and get the boring part out of the way early 😀

@ginglis13 ginglis13 marked this pull request as ready for review March 29, 2024 19:21
@ginglis13
Copy link
Contributor Author

^escape commented out macros

Adds boiler plate for k8s-1.30 variants based on previous addition of
k8s variants. This commit does not add the actual k8s-1.30 sources, but
rather sets the stage for incremental changes to k8s-1.30 variants.

This adds a k8s-1.30 package. Existing 1.29 models are moved to be 1.30,
with symlinks created for 1.29 models to point to the new locations.
For now, the k8s-1.30 package points to the k8s-1.29 source.

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
@ginglis13
Copy link
Contributor Author

^fix build by specifying kubelet dependency on ecr-credential-provider-1.29, since ecr-credential-provider-1.30 isn't available yet.

error was:

nothing provides bottlerocket-ecr-credential-provider-1.30 needed by bottlerocket-kubelet-1.30-1.29.1-1.aarch64 from repo

built all k8s-1.30 variants to confirm.

@ginglis13 ginglis13 merged commit 4527bb6 into bottlerocket-os:develop Mar 29, 2024
55 checks passed
@ginglis13 ginglis13 deleted the k8s-1.30 branch April 22, 2024 18:29
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.

None yet

3 participants