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

certdog: change certdog to use a generated certdog.toml file #3706

Merged

Conversation

jmt-lab
Copy link
Contributor

@jmt-lab jmt-lab commented Jan 9, 2024

Issue number: #3623

Closes #3623

Description of changes:
Changed certdog binary to accept an argument -c instead of -s that defaults to the location /etc/certdog.toml. This toml file will be generated by schnauzer from settings.pki. Certdog now will read the custom certificates from this generated template instead of calling back to the settings api.

Testing done:
Tested via ecs using the aws-ecs-2 variant and verified that the file is generated correctly and certdog runs with no errors

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.

@jmt-lab jmt-lab force-pushed the jmt/ootb/certdog-config-file branch from 121d793 to ee8a24b Compare January 9, 2024 21:44
packages/os/certdog-toml Outdated Show resolved Hide resolved
packages/os/certdog-toml Outdated Show resolved Hide resolved
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
sources/models/shared-defaults/defaults.toml Show resolved Hide resolved
sources/models/shared-defaults/defaults.toml Outdated Show resolved Hide resolved
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
@jmt-lab jmt-lab force-pushed the jmt/ootb/certdog-config-file branch 5 times, most recently from 258e5bb to 4f418f9 Compare January 16, 2024 20:35
@jmt-lab jmt-lab marked this pull request as ready for review January 16, 2024 21:21
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
packages/os/certdog-toml Show resolved Hide resolved
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
sources/api/certdog/src/main.rs Outdated Show resolved Hide resolved
@jmt-lab jmt-lab force-pushed the jmt/ootb/certdog-config-file branch from 03fbb5c to ebf1a29 Compare February 2, 2024 21:53
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Feb 2, 2024

Updated per comments
Rebased commits and consolidated work
Split migrations

@jmt-lab jmt-lab requested a review from webern February 2, 2024 21:54
@jmt-lab jmt-lab force-pushed the jmt/ootb/certdog-config-file branch from ebf1a29 to 8dd9b5c Compare February 2, 2024 21:57
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Feb 2, 2024

Fix build issue

@webern
Copy link
Contributor

webern commented Feb 5, 2024

Fix build

Still has unused imports.

@jmt-lab jmt-lab force-pushed the jmt/ootb/certdog-config-file branch from 8dd9b5c to ebd9581 Compare February 5, 2024 20:12
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Feb 5, 2024

Removing unused imports

@jmt-lab jmt-lab force-pushed the jmt/ootb/certdog-config-file branch from ebd9581 to d553ba9 Compare February 6, 2024 22:24
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Feb 6, 2024

Rebased on latest

Copy link
Contributor

@webern webern left a comment

Choose a reason for hiding this comment

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

We don't actually want to merge this PR with it doing the version bump. The release should yeild a PR that bumps to 1.20. After that, rebase, then it's ready .

Release.toml Outdated Show resolved Hide resolved
@webern
Copy link
Contributor

webern commented Feb 7, 2024

Let's merge this first #3768 then rebase your PR to align on 1.19.2

@jmt-lab jmt-lab force-pushed the jmt/ootb/certdog-config-file branch 3 times, most recently from 9a9f2f5 to b85b0a2 Compare February 8, 2024 22:52
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Feb 12, 2024

Rebased off latest
Removed unneded extension in template
Removed incorrect migration in AddPrefixes
Updated log message to be accurate

@jmt-lab jmt-lab merged commit 589d466 into bottlerocket-os:develop Feb 13, 2024
50 checks passed
@jmt-lab jmt-lab deleted the jmt/ootb/certdog-config-file branch February 13, 2024 18:06
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.

OOTB: Remove model dependency from certdog
4 participants