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

Added decryption of Kustomize patches and refactor SOPS tests #1286

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

vlasov-y
Copy link
Contributor

@vlasov-y vlasov-y commented Nov 12, 2024

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

@vlasov-y
Copy link
Contributor Author

@stefanprodan tagging you because you have reviewed #1283 for me 😅

@stefanprodan stefanprodan added area/sops SOPS related issues and pull requests area/testing Testing related issues and pull requests labels Nov 12, 2024
@@ -788,6 +790,86 @@ data:
sops.vault-token: <BASE64>
```

#### Important case: SOPS decryption encrypted_regex conflict
Copy link
Member

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.

Copy link
Contributor Author

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

Copy link
Member

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.

Copy link
Contributor Author

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]>
@stefanprodan stefanprodan changed the title Added decryption of resources and patches. Refactored SOPS test data. Added decryption of Kustomize patches and refactor SOPS tests Dec 4, 2024
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 @vlasov-y 🏅

@stefanprodan stefanprodan merged commit 933ef1f into fluxcd:main Dec 4, 2024
6 checks passed
@stefanprodan
Copy link
Member

@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:

  • ghcr.io/fluxcd/kustomize-controller:rc-9974a49b
  • docker.io/fluxcd/kustomize-controller:rc-9974a49b

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 area/testing Testing related issues and pull requests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants