-
Notifications
You must be signed in to change notification settings - Fork 185
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
Added decryption of Kustomize patches and refactor SOPS tests #1286
Conversation
@stefanprodan tagging you because you have reviewed #1283 for me 😅 |
8163ee2
to
96206e3
Compare
docs/spec/v1/kustomizations.md
Outdated
@@ -788,6 +790,86 @@ data: | |||
sops.vault-token: <BASE64> | |||
``` | |||
|
|||
#### Important case: SOPS decryption encrypted_regex conflict |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This example could be in the docs guide here: https://fluxcd.io/flux/guides/mozilla-sops/
For the API docs, I think we just need a phrase with just the solution from above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added same text here fluxcd/website#2107
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great! You can remove now this section and tidy up your commits, then it's good for merge.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. I have squashed all my commits into one.
Cleaned SOPS tests. Signed-off-by: Yuriy <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks @vlasov-y 🏅
@vlasov-y I've published a release candidate of kustomize-controller that contains the changes in this PR. You use these images until Flux 2.5 is released:
|
Hi ✋
In addition to the previous PR, I've added decryption for the resource and patch files before the build process. I also found the test data for SOPS to be quite messy, so I restructured it entirely and streamlined the controller test code.
Followup: #1283