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

Update default variant to aws-k8s-1.21 #1686

Merged
merged 1 commit into from
Aug 3, 2021

Conversation

tjkirch
Copy link
Contributor

@tjkirch tjkirch commented Aug 2, 2021

Description of changes:

  • Update Makefile.toml to build aws-k8s-1.21 by default instead of 1.19
  • Update documentation and examples to reference aws-k8s-1.21
  • Make sources/models/src/aws-k8s-1.21/mod.rs the canonical k8s model by making 1.19 link to 1.21 instead of vice versa, without changing the file contents (we symlink aws-k8s-*/mod.rs to a single file, and reference that one file from sources/models/README.md, so it's readable in GitHub, since symlinks aren't)

For reference, the last update to a 1.19 default was here: #1394

Testing done:

Confirmed cargo make builds a working 1.21. Also confirmed 1.19 builds are still healthy.

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.

@tjkirch tjkirch requested review from zmrow, webern and etungsten August 2, 2021 21:05
@tjkirch
Copy link
Contributor Author

tjkirch commented Aug 3, 2021

^ This push rebases on develop to fix a conflict with #1629. I retested 1.19 and 1.21. git was a little angry about it because of the file type change to sources/models/src/aws-k8s-1.{19,21}/mod.rs; @etungsten would you mind double-checking my work?

@tjkirch tjkirch requested a review from etungsten August 3, 2021 02:08
@tjkirch tjkirch merged commit edabbd9 into bottlerocket-os:develop Aug 3, 2021
@tjkirch tjkirch deleted the default-1.21 branch August 3, 2021 16:24
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.

3 participants