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

models: remove aws-k8s-1.15 files/references, redo symlinks, add aws-k8s-1.19 defaults #1487

Merged
merged 2 commits into from
Apr 15, 2021

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Apr 14, 2021

Issue number:
N/A

Description of changes:

Author: Erikson Tung <etung@amazon.com>
Date:   Tue Apr 13 17:46:52 2021 -0700

    models: redo k8s variant symlinks, add aws-k8s-1.19 model/defaults
    
    Create default and model files for the aws-k8s-1.19 variant.
    Relink the symlink for all k8s variants so they link to aws-k8s-1.19's
    files.


Author: Erikson Tung <etung@amazon.com>
Date:   Wed Apr 14 14:09:58 2021 -0700

    variants, models: remove aws-k8s-1.15 files and references
    
    This deletes aws-k8s-1.15 models and defaults and the variant directory.
    The aws-k8s-1.15 can no longer be built.

Testing done:
Built aws-k8s-1.16, aws-k8s-1.17, aws-k8s-1.18, aws-k8s-1.19 image successfully. Launched instances with said images and they all come up successfully and show up ready in my cluster.

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.

@jpculp
Copy link
Member

jpculp commented Apr 14, 2021

Rather than having everything symlink to 1.16, would it make more sense to make the symlinks point to 1.19? That way we wouldn't have to make this change each time a version is deprecated.

@etungsten
Copy link
Contributor Author

Push above removes files and directories related to aws-k8s-1.15. Truly deprecates the aws-k8s-1.15 variant.

@etungsten
Copy link
Contributor Author

Rather than having everything symlink to 1.16, would it make more sense to make the symlinks point to 1.19? That way we wouldn't have to make this change each time a version is deprecated.

I think I'd prefer keeping the symlinks as they are now since we're likely to change something about newer k8s variants that older k8s variants might not support (necessitating a different set of defaults, setting models, etc) before we deprecate another k8s variant. So I think it makes sense to symlink back to older k8s versions as they are more "stable" in a sense.

@tjkirch
Copy link
Contributor

tjkirch commented Apr 14, 2021

Rather than having everything symlink to 1.16, would it make more sense to make the symlinks point to 1.19? That way we wouldn't have to make this change each time a version is deprecated.

I think I'd prefer keeping the symlinks as they are now since we're likely to change something about newer k8s variants that older k8s variants might not support (necessitating a different set of defaults, setting models, etc) before we deprecate another k8s variant. So I think it makes sense to symlink back to older k8s versions as they are more "stable" in a sense.

I don't think we'd do that with an existing variant, though, only a new one like 1.20, since we don't want to change behavior in any breaking way for existing users.

@etungsten etungsten changed the title models: remove aws-k8s-1.16 symlink, add aws-k8s-1.16 defaults models: remove aws-k8s-1.15 files/references, remove aws-k8s-1.16 symlink, add aws-k8s-1.16 defaults Apr 14, 2021
@etungsten etungsten changed the title models: remove aws-k8s-1.15 files/references, remove aws-k8s-1.16 symlink, add aws-k8s-1.16 defaults models: remove aws-k8s-1.15 files/references, redo symlinks, add aws-k8s-1.16 defaults Apr 14, 2021
@etungsten
Copy link
Contributor Author

Adopts #1487 (comment) suggestion.
Push above reverses the symlink's direction so aws-k8s-1.19's directory is the source of all the symlinks.

@etungsten etungsten requested a review from jpculp April 14, 2021 22:18
variants/README.md Outdated Show resolved Hide resolved
@etungsten etungsten changed the title models: remove aws-k8s-1.15 files/references, redo symlinks, add aws-k8s-1.16 defaults models: remove aws-k8s-1.15 files/references, redo symlinks, add aws-k8s-1.19 defaults Apr 14, 2021
sources/models/README.md Outdated Show resolved Hide resolved
variants/README.md Outdated Show resolved Hide resolved
Create default and model files for the aws-k8s-1.19 variant.
Relink the symlink for all k8s variants so they link to aws-k8s-1.19's
files.
This deletes aws-k8s-1.15 models and defaults and the variant directory.
The aws-k8s-1.15 can no longer be built.
@etungsten
Copy link
Contributor Author

Push above addresses @bcressey 's comments.

@etungsten etungsten requested a review from bcressey April 15, 2021 17:38
@etungsten etungsten merged commit 403a5b9 into bottlerocket-os:develop Apr 15, 2021
@etungsten etungsten deleted the bye-1.15 branch April 15, 2021 17:56
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.

5 participants