First commits #3

king-alexander · 2023-04-18T15:24:12Z

🗣 Description

These first commits modify cisagov/skeleton-ansible-role to install The Admiral. The changes group initial code, files, and documentation for the role so we can reuse them across deployments.

💭 Motivation and context

We want to use this role to ship the Admiral off to sea. See cisagov/cyhy_amis#639 for full details of the voyage.

Resolves Restrict Redis to localhost #8

🧪 Testing

I updated the default test scenario in 125e9eb. All 33 tests passed (in 19.34 seconds).

My testing environment was pyenv 2.3.15 running Python 3.9.13.

In addition, I successfully used the role to create the /var/cyhy/admiral directory on my local machine and verified that the correct Docker Compose files were in place.

✅ Pre-approval checklist

This PR has an informative and human-readable title.
Changes are limited to a single goal - eschew scope creep!

All relevant type-of-change labels have been added.
I have read the CONTRIBUTING document.
These code changes follow cisagov code standards.
All relevant repo and/or project documentation has been updated
to reflect the changes in this PR.
Tests have been added and/or modified to cover the changes in this PR.
All new and existing tests pass.

jsf9k

Strong work!

dav3r

This all looks great, aside from the minor things I noted, but before I approve this, I'd really like to see the "Testing" section mention that you successfully used this role to install the Admiral somewhere and that it functioned as expected.

meta/main.yml

king-alexander · 2023-04-20T14:37:22Z

This all looks great, aside from the minor things I noted, but before I approve this, I'd really like to see the "Testing" section mention that you successfully used this role to install the Admiral somewhere and that it functioned as expected.

Functions as expected!

jsf9k · 2023-04-20T14:45:24Z

@king-alexander - Reminder to turn on the branch protections before or after you merge this one (or ask me to do it, if you lack the necessary permissions).

mcdonnnj · 2023-04-20T16:45:53Z

files/docker-compose-dev.yml

I don't know that this file belongs in this project. In a deployment there is no reason for the Admiral source code to be on the instance. Any development work would involve pulling down a built Docker image with the changes being worked on and that would be done using the appropriate tag from Docker Hub.

Removed in b390329.

You bring up a good point. The development configuration exposes a bash shell which runs the script to collect new certificates. Should that be shoved into docker-compose, or do we need to rethink how to probe the CT Search API?

That is a good question. When does that script need to be run? It might make sense to create an issue to incorporate that as a docker-compose.override.yml configuration option if it would see regular use.

I run the script every time I boot up the Admiral composition (on average, about once per week). I created cisagov/admiral-docker#13 to capture how we manage these Compose files as a unit of work.

@mcdonnnj - Can this conversation be resolved?

meta/main.yml

tasks/main.yml

molecule/default/tests/test_default.py

README.md

dav3r · 2023-04-26T14:28:37Z

@king-alexander Why are the molecule tests failing?

mcdonnnj · 2023-04-26T15:39:16Z

@king-alexander Why are the molecule tests failing?

@dav3r cisagov/skeleton-ansible-role#139

dav3r · 2023-05-15T15:06:57Z

@king-alexander Why are the molecule tests failing?

@dav3r cisagov/skeleton-ansible-role#139

@king-alexander Any updates here now that cisagov/skeleton-ansible-role#139 has been merged?

.github/CODEOWNERS

dav3r

Looks like a winner now- good work! ⚓

jsf9k

Approval intensifies!!!

jsf9k

One comment and one change request.

.github/CODEOWNERS

meta/main.yml

king-alexander · 2023-09-22T15:55:21Z

Approval reaches a fever pitch!!!

Let's merge #9 before we merge this one.

I rebased now that #9 is merged. Note that I dropped the commits where I disable and reenable Amazon Linux 2023 now that the platform works just fine.

jsf9k

I approve with the power of 1000 suns!!!

dav3r

I noticed two Docker images that should be updated here, assuming they work. Please check them out.

files/docker-compose.yml

king-alexander · 2023-09-25T19:01:01Z

I noticed two Docker images that should be updated here, assuming they work. Please check them out.

Your assumptions were correct. I noticed no issues with either image.

dav3r

Approval intensifies! 🎬

king-alexander · 2024-05-30T22:20:00Z

Rebase after latest pull request is merged, then send up flare 🎇

These composition files will be deployed in the Ansible role.

This role executes 3 tasks: creating the `/var/cyhy/admiral` directory, installing the Docker Compose configuration, and installing the Docker Compose development configuration.

We verify that the correct directory exists with the correct files and permisions.

Update the README from the generic skeleton to details specific to this project. There are no requirements or role variables, but the project does depend on the Ansible Role for Docker.

Future development work should be done from a pre-built Docker image, so the development configuration does not belong in this project.

Co-authored-by: dav3r <[email protected]>

Alphabetize owners and add myself as an owner for the .github directory.

These two variables provide the option to set ownership for any files or directories created by the role. I updated the README to reflect this new ability.

Use the role variables to set ownership for the Docker composition in addition to the admiral directory.

Co-authored-by: dav3r <[email protected]>

king-alexander · 2024-06-27T21:19:56Z

Rebase after latest pull request is merged, then send up flare 🎇

Flare burns brighter! 🎆 @dav3r @jsf9k @mcdonnnj @felddy

jsf9k · 2024-06-27T22:28:00Z

Rebase after latest pull request is merged, then send up flare 🎇

Flare burns brighter! 🎆 @dav3r @jsf9k @mcdonnnj @felddy

dav3r

Approval shines bright like a 💎

jsf9k

And ~~Rohan~~ @jsf9k will answer!

king-alexander added documentation This issue or pull request improves or adds to documentation improvement This issue or pull request will add or improve functionality, maintainability, or ease of use labels Apr 18, 2023

king-alexander force-pushed the first-commits branch from d05d1b6 to 8e8ea9a Compare April 18, 2023 15:26

king-alexander marked this pull request as ready for review April 18, 2023 16:10

king-alexander requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners April 18, 2023 16:10

jsf9k approved these changes Apr 19, 2023

View reviewed changes

dav3r reviewed Apr 19, 2023

View reviewed changes

meta/main.yml Outdated Show resolved Hide resolved

meta/main.yml Show resolved Hide resolved

mcdonnnj requested changes Apr 20, 2023

View reviewed changes

king-alexander force-pushed the first-commits branch 2 times, most recently from df4546d to 5fff4cb Compare April 25, 2023 14:47

king-alexander self-assigned this Apr 25, 2023

dav3r reviewed Apr 25, 2023

View reviewed changes

README.md Outdated Show resolved Hide resolved

king-alexander force-pushed the first-commits branch from c0febdb to 142bdfb Compare May 15, 2023 19:33

king-alexander requested a review from jasonodoom as a code owner May 15, 2023 19:33

dav3r reviewed May 15, 2023

View reviewed changes

.github/CODEOWNERS Outdated Show resolved Hide resolved

dav3r approved these changes May 15, 2023

View reviewed changes

jsf9k approved these changes May 15, 2023

View reviewed changes

jsf9k requested a review from mcdonnnj May 15, 2023 20:09

king-alexander mentioned this pull request Jul 21, 2023

Deploy Admiral cisagov/cyhy_amis#639

Open

king-alexander mentioned this pull request Jul 28, 2023

Implement functional testing cisagov/admiral#9

Open

king-alexander force-pushed the first-commits branch from 7beb6c6 to c543586 Compare August 1, 2023 13:03

jsf9k requested changes Aug 1, 2023

View reviewed changes

.github/CODEOWNERS Show resolved Hide resolved

meta/main.yml Show resolved Hide resolved

jsf9k approved these changes Sep 22, 2023

View reviewed changes

king-alexander requested a review from mcdonnnj September 22, 2023 17:14

dav3r reviewed Sep 22, 2023

View reviewed changes

files/docker-compose.yml Outdated Show resolved Hide resolved

files/docker-compose.yml Outdated Show resolved Hide resolved

dav3r approved these changes Sep 25, 2023

View reviewed changes

king-alexander and others added 11 commits June 27, 2024 11:50

Update role metadata

2518305

Add Docker Compose files

5e9ecaa

These composition files will be deployed in the Ansible role.

Implement role tasks

9f69a7c

This role executes 3 tasks: creating the `/var/cyhy/admiral` directory, installing the Docker Compose configuration, and installing the Docker Compose development configuration.

Update the default test scenario

031c7d8

We verify that the correct directory exists with the correct files and permisions.

Update documentation

9f6d2e2

Update the README from the generic skeleton to details specific to this project. There are no requirements or role variables, but the project does depend on the Ansible Role for Docker.

Remove Docker Compose development configuration

b0e34ae

Future development work should be done from a pre-built Docker image, so the development configuration does not belong in this project.

Update role tags

dfba591

Co-authored-by: dav3r <[email protected]>

Explain Admiral's purpose

c3ad483

Co-authored-by: dav3r <[email protected]>

Add myself as a code owner

8bd4353

Alphabetize CODEOWNERS

e3e675b

Co-authored-by: dav3r <[email protected]>

Restrict Redis to localhost

2ace4dd

king-alexander force-pushed the first-commits branch from 5ad989e to 7a6f4e1 Compare June 27, 2024 17:05

king-alexander and others added 6 commits June 27, 2024 13:19

Adjust CODEOWNERS

2f4bb73

Alphabetize owners and add myself as an owner for the .github directory.

Add ownership variables

dcc5e82

These two variables provide the option to set ownership for any files or directories created by the role. I updated the README to reflect this new ability.

Update variable names

deb739e

Extend ownership to the Docker composition

4891686

Use the role variables to set ownership for the Docker composition in addition to the admiral directory.

Use Redis Commander v0.8.1

77ff26e

Co-authored-by: dav3r <[email protected]>

Use Redis v7.2.1-alpine

f0d543d

Co-authored-by: dav3r <[email protected]>

king-alexander force-pushed the first-commits branch from 7a6f4e1 to f0d543d Compare June 27, 2024 18:19

dav3r approved these changes Jun 28, 2024

View reviewed changes

jsf9k approved these changes Jun 28, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

First commits #3

First commits #3

king-alexander commented Apr 18, 2023 •

edited

Loading

jsf9k left a comment

dav3r left a comment

king-alexander commented Apr 20, 2023

jsf9k commented Apr 20, 2023

mcdonnnj Apr 20, 2023

king-alexander Apr 21, 2023 •

edited by mcdonnnj

Loading

mcdonnnj Sep 14, 2023

king-alexander Sep 15, 2023

jsf9k Apr 10, 2024

dav3r commented Apr 26, 2023

mcdonnnj commented Apr 26, 2023

dav3r commented May 15, 2023

dav3r left a comment

jsf9k left a comment

jsf9k left a comment

king-alexander commented Sep 22, 2023

jsf9k left a comment

dav3r left a comment

king-alexander commented Sep 25, 2023

dav3r left a comment

king-alexander commented May 30, 2024

king-alexander commented Jun 27, 2024 •

edited

Loading

jsf9k commented Jun 27, 2024

dav3r left a comment

jsf9k left a comment

First commits #3

Are you sure you want to change the base?

First commits #3

Conversation

king-alexander commented Apr 18, 2023 • edited Loading

🗣 Description

💭 Motivation and context

🧪 Testing

✅ Pre-approval checklist

jsf9k left a comment

Choose a reason for hiding this comment

dav3r left a comment

Choose a reason for hiding this comment

king-alexander commented Apr 20, 2023

jsf9k commented Apr 20, 2023

mcdonnnj Apr 20, 2023

Choose a reason for hiding this comment

king-alexander Apr 21, 2023 • edited by mcdonnnj Loading

Choose a reason for hiding this comment

mcdonnnj Sep 14, 2023

Choose a reason for hiding this comment

king-alexander Sep 15, 2023

Choose a reason for hiding this comment

jsf9k Apr 10, 2024

Choose a reason for hiding this comment

dav3r commented Apr 26, 2023

mcdonnnj commented Apr 26, 2023

dav3r commented May 15, 2023

dav3r left a comment

Choose a reason for hiding this comment

jsf9k left a comment

Choose a reason for hiding this comment

jsf9k left a comment

Choose a reason for hiding this comment

king-alexander commented Sep 22, 2023

jsf9k left a comment

Choose a reason for hiding this comment

dav3r left a comment

Choose a reason for hiding this comment

king-alexander commented Sep 25, 2023

dav3r left a comment

Choose a reason for hiding this comment

king-alexander commented May 30, 2024

king-alexander commented Jun 27, 2024 • edited Loading

jsf9k commented Jun 27, 2024

dav3r left a comment

Choose a reason for hiding this comment

jsf9k left a comment

Choose a reason for hiding this comment

king-alexander commented Apr 18, 2023 •

edited

Loading

king-alexander Apr 21, 2023 •

edited by mcdonnnj

Loading

king-alexander commented Jun 27, 2024 •

edited

Loading