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 to Bottlerocket #722

Merged
merged 17 commits into from
Feb 13, 2020
Merged

Rename to Bottlerocket #722

merged 17 commits into from
Feb 13, 2020

Conversation

tjkirch
Copy link
Contributor

@tjkirch tjkirch commented Feb 12, 2020

This renames everything in the repo to Bottlerocket, except for some things listed below.

bottlerocket-admin and bottlerocket-control repos were created in ECR, and v0.2 and v0.3 of each image were uploaded in us-west-2 and us-east-1.

Remaining work, outside this PR:

"Thar" references not updated in this PR:

  • AWS account names/emails
  • The name of "thar-be-settings"
  • Host container names in existing migrations, since that was their name then...
  • References to GitHub URL, slack channel, email addresses
  • The default TUF repo bucket name "thar-be-updates-in-us-west-2" in the timestamp Lambda
  • Lookaside cache URL (I think we should update this sometime, but not urgent)
  • The dogswatch package is now named for bottlerocket, but still refers to a repo that doesn't exist; we can fix this when we have the repo!

Testing done:

  • workspaces/ unit tests pass.
  • New SDK built for x86_64 and aarch64, and used to build an AMI.
  • AMI built, connects to cluster, pods run OK.
  • Existing Thar host containers work, except for SSH host key persistence (because it looks in /.thar which isn't there anymore).
  • New Bottlerocket host containers work.

Testing not done, but that will happen before next release:

  • dogswatch: hoping @jahkeup can help here.
  • Upgrade testing, because of missing migrations; see "remaining work" above.

INSTALL.md Show resolved Hide resolved
packages/release/var-lib-bottlerocket.mount Outdated Show resolved Hide resolved
tools/rpm2img Show resolved Hide resolved
@tjkirch
Copy link
Contributor Author

tjkirch commented Feb 12, 2020

As discussed separately, this push removes the change to the partition labels, instead leaving them as "THAR-*" so we don't break upgrades yet. That change will go to another PR for when we're ready to merge it.

This also removes the "THAR"/"BOTTLEROCKET" filesystem labels, which were unused and potentially confusing.

(I retested by remaking an AMI, running pods, etc.)

START.md Show resolved Hide resolved
START.md Outdated Show resolved Hide resolved
START.md Show resolved Hide resolved
extras/dogswatch/Dockerfile Show resolved Hide resolved
extras/dogswatch/README.md Show resolved Hide resolved
packages/release/release.spec Show resolved Hide resolved
tools/gen-docs.sh Show resolved Hide resolved
tools/rpm2img Outdated Show resolved Hide resolved
workspaces/README.md Show resolved Hide resolved
workspaces/api/settings-committer/src/main.rs Outdated Show resolved Hide resolved
@tjkirch
Copy link
Contributor Author

tjkirch commented Feb 12, 2020

This push addresses some of @bcressey's comments. Retested with a new AMI.

@tjkirch
Copy link
Contributor Author

tjkirch commented Feb 13, 2020

This push kills the crab. (sorry about the double push, it's just the "fixup" commit that I then rebased in)

Copy link
Member

@jahkeup jahkeup left a comment

Choose a reason for hiding this comment

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

The dogswatch changes look good to me - it builds and passes unit tests. I don't have the bandwidth to run the dogswatch tests mentioned for this PR, but will follow up with the next-release testing to check that we're not broken as @tjkirch hinted at.

@tjkirch
Copy link
Contributor Author

tjkirch commented Feb 13, 2020

Rebased on develop to fix conflicts; this removed a couple thar/bottlerocket references thanks to Jake's changes, and I updated the licenses squashfs change to use "bottlerocket" in paths and such. Built a new AMI and pods are OK, /usr/share/licenses still works.

tjkirch added a commit that referenced this pull request Feb 13, 2020
@tjkirch
Copy link
Contributor Author

tjkirch commented Feb 13, 2020

iliana and I merged this with #719 and are building new SDKs; once those are uploaded we'll push the merge.

@iliana iliana merged commit 208bcc6 into develop Feb 13, 2020
@tjkirch tjkirch deleted the bottlerocket branch February 13, 2020 22:34
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.

7 participants