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

Mask dockerconfigjson secret types and support StringData secrets #2392

Merged
merged 1 commit into from
Feb 7, 2022

Conversation

souleb
Copy link
Member

@souleb souleb commented Feb 5, 2022

If implemented, flux diff kustomization will managed correctly sops
managed dockerconfigjson secrets.

Sops encrypted secret with stringData maps are supported too.

Fix: #2387
Fix: #2388

Signed-off-by: Soule BA soule@weave.works

@souleb souleb added bug Something isn't working area/diff Diff related issues and pull requests labels Feb 5, 2022
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.

@souleb I think this also solves #2388 can you please add it the PR description and explain that we now handle both data types. Thanks!

@souleb souleb changed the title Mask dockerconfigjson secret types with a json object Mask dockerconfigjson secret types and support StringData secrets Feb 6, 2022
If implemented, flux diff kustomization will managed correctly sops
managed dockerconfigjson secrets.
Sops encrypted secret with stringData maps are supported too.

Signed-off-by: Soule BA <soule@weave.works>
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 @souleb 🥇

@stefanprodan stefanprodan merged commit ca92464 into fluxcd:main Feb 7, 2022
@souleb souleb deleted the issue-2387 branch February 7, 2022 09:51
dexhorthy added a commit to github-csat/github-csat that referenced this pull request Dec 28, 2022
trying to work around this fluxcd/flux2#2392
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/diff Diff related issues and pull requests bug Something isn't working
Projects
None yet
2 participants