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

Rename aws-k8s to aws-k8s-1.15 #785

Merged
merged 2 commits into from
Feb 27, 2020
Merged

Rename aws-k8s to aws-k8s-1.15 #785

merged 2 commits into from
Feb 27, 2020

Conversation

tjkirch
Copy link
Contributor

@tjkirch tjkirch commented Feb 26, 2020

commit 5666387cbfd3c5f6c253ba5fa7e00dd1cd1e3a8d
Author: Tom Kirchner <[email protected]>
Date:   Wed Feb 26 14:07:12 2020 -0800

updog: print space between variant and version rather than hyphen

Variant names can include versions (e.g. aws-k8s-1.15) and seeing that combined
with the update version using a hyphen can be confusing.  For example, in
aws-k8s-1.15-0.3.0, it's unclear what each version applies to.  This change
uses a space instead, to visually separate the two components.
commit 60ebe8c47f5fcd3e92e2479c94395456efa4817b
Author: Tom Kirchner <[email protected]>
Date:   Wed Feb 26 14:07:03 2020 -0800

Rename aws-k8s variant to aws-k8s-1.15

This requires removing the variants workspace, which we had intended to do
anyway because you wouldn't want to build the whole workspace.  It needs to be
removed now because "." isn't valid in a package name, and we were passing the
variant name to build the variant's "package".

Testing done:

Unit tests pass. Built an image, ran a pod OK, API settings OK. os-release shows new variant:

bash-5.0# cat /etc/os-release 
NAME=Bottlerocket
ID=bottlerocket
PRETTY_NAME="Bottlerocket OS 0.3.0"
VARIANT_ID=aws-k8s-1.15
VERSION_ID=0.3.0
BUILD_ID=c047e914-dirty

@tjkirch
Copy link
Contributor Author

tjkirch commented Feb 27, 2020

@bcressey pointed out that nothing actually uses the crate names where this appears (/variants/FOO, /sources/models/src/FOO), so we can use the "." where we want to normally, and the "_" just in those two places that don't matter.

Trying this now.

This requires removing the variants workspace, which we had intended to do
anyway because you wouldn't want to build the whole workspace.  It needs to be
removed now because "." isn't valid in a package name, and we were passing the
variant name to build the variant's "package".
Variant names can include versions (e.g. aws-k8s-1.15) and seeing that combined
with the update version using a hyphen can be confusing.  For example, in
aws-k8s-1.15-0.3.0, it's unclear what each version applies to.  This change
uses a space instead, to visually separate the two components.
@tjkirch
Copy link
Contributor Author

tjkirch commented Feb 27, 2020

This push gets us back to "aws-k8s-1.15" (with the dot) by removing the variants workspace, which wasn't helpful anyway. Testing updated.

@tjkirch tjkirch changed the title Rename aws-k8s to aws-k8s-1_15 Rename aws-k8s to aws-k8s-1.15 Feb 27, 2020
@tjkirch tjkirch requested a review from jhaynes February 27, 2020 01:33
@tjkirch tjkirch merged commit f3b8f01 into develop Feb 27, 2020
@tjkirch tjkirch deleted the rename-variant branch February 27, 2020 01:40
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