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

Switch paths from host-containers/admin to host-containers/current #21

Merged
merged 1 commit into from
Mar 31, 2021

Conversation

jpculp
Copy link
Member

@jpculp jpculp commented Mar 31, 2021

Issue number:

N/A

Description of changes:

This replaces any code that referenced host-containers/admin with the recently introduced current dir to support admin containers with a custom name.

Testing done:

  • Launched aws-ecs-1 ami with the admin container disabled and a custom-admin container enabled.
  • Instance connected to ecs cluster.
  • Test task deployed successfully.
  • Connected to custom-admin container via ssh.
  • Verified that /.bottlerocket/host-containers contained two directories: custom-admin and current
  • cat etc/ssh/sshd_config to verify the host keys mapped to /.bottlerocket/host-containers/current/etc/ssh/.
  • Verified that /.bottlerocket/host-containers/current/etc/ssh/ contained host keys.
  • Ran sudo sheltie to verify root shell was still available.
  • Checked for failed systemd units.

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.

This replaces any code that referenced `host-containers/admin` with the
recently introduced `current` dir to support admin containers with a
custom name.
Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🛴

@jpculp jpculp merged commit 34749d9 into bottlerocket-os:develop Mar 31, 2021
@jpculp jpculp deleted the switch-to-current-dir branch March 31, 2021 16:25
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.

4 participants