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

sops: drop forked keyservices #947

Merged
merged 9 commits into from
Aug 25, 2023
Merged

sops: drop forked keyservices #947

merged 9 commits into from
Aug 25, 2023

Conversation

hiddeco
Copy link
Member

@hiddeco hiddeco commented Aug 15, 2023

@hiddeco hiddeco added enhancement New feature or request area/sops SOPS related issues and pull requests labels Aug 15, 2023
@hiddeco hiddeco force-pushed the drop-forked-keyservices branch 2 times, most recently from b9f9371 to 7198bc9 Compare August 15, 2023 18:11
Makefile Outdated Show resolved Hide resolved
This updates `go.mozilla.org/sops/v3` to the `v3.8.0-rc.1` release of
`github.com/getsops/sops/v3`.

This (finally) allows us to drop our forked key sources, as they have
now been contributed upstream in a slightly modified form which still
allows us to maintain control over the used credentials in isolation.

Signed-off-by: Hidde Beydals <[email protected]>
As the forked code has been contributed upstream in a modified format.

Signed-off-by: Hidde Beydals <[email protected]>
As the forked code has been contributed upstream in a modified format.

Signed-off-by: Hidde Beydals <[email protected]>
As the forked code has been contributed upstream in a modified format.

We continue to inject our own default credentials in the key server if
none are provided by the Kustomization, to ensure we do not shell out
to `az`.

Signed-off-by: Hidde Beydals <[email protected]>
As the forked code has been contributed upstream in a modified format.

Signed-off-by: Hidde Beydals <[email protected]>
As the forked code has been contributed upstream in a modified format.

Signed-off-by: Hidde Beydals <[email protected]>
As the forked code has been contributed upstream in a modified format.

Signed-off-by: Hidde Beydals <[email protected]>
As all remaining code is now no longer derived from MPL-2.0 licensed
code.

Signed-off-by: Hidde Beydals <[email protected]>
Signed-off-by: Hidde Beydals <[email protected]>
@stefanprodan stefanprodan marked this pull request as ready for review August 25, 2023 13:08
Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @hiddeco 🥇

@hiddeco hiddeco merged commit 6dcf08b into main Aug 25, 2023
6 checks passed
@hiddeco hiddeco deleted the drop-forked-keyservices branch August 25, 2023 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/sops SOPS related issues and pull requests enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants