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

Make secret ref configurable #113

Merged
merged 2 commits into from
Mar 16, 2021

Conversation

moolen
Copy link
Contributor

@moolen moolen commented Mar 12, 2021

This PR makes the GitRepsository.spec.secretRef configurable and ensures that the provider stays backwards compatible with the versions pre v0.0.13.
In 0.0.13 the default secret-name is flux-system, before that it was the flux_sync resource name. Details in #104.

Closes #104

@moolen moolen force-pushed the fix/make-secret-configurable branch from bd960b7 to acbd7d4 Compare March 12, 2021 07:53
phillebaba
phillebaba previously approved these changes Mar 13, 2021
pkg/provider/data_sync.go Outdated Show resolved Hide resolved
pkg/provider/data_sync.go Outdated Show resolved Hide resolved
@phillebaba phillebaba self-requested a review March 13, 2021 19:20
@phillebaba phillebaba dismissed their stale review March 13, 2021 19:21

unintended approval

@moolen moolen force-pushed the fix/make-secret-configurable branch from acbd7d4 to aa2f8e0 Compare March 15, 2021 20:05
Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>
@moolen moolen force-pushed the fix/make-secret-configurable branch from aa2f8e0 to 5170443 Compare March 15, 2021 20:55
@moolen
Copy link
Contributor Author

moolen commented Mar 15, 2021

There's an outage with github actions right now link. I'll check back tomorrow to see if i need to re-trigger ci

Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>
@moolen moolen force-pushed the fix/make-secret-configurable branch from 19a54ec to 97307f1 Compare March 16, 2021 08:02
Copy link
Member

@phillebaba phillebaba left a comment

Choose a reason for hiding this comment

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

LGTM 🌹

Thank you for the hard work. I just need to merge a couple of other PRs so will make a release later tonight.

@phillebaba phillebaba merged commit 38d94eb into fluxcd:main Mar 16, 2021
@moolen moolen deleted the fix/make-secret-configurable branch March 16, 2021 10:06
@phillebaba phillebaba changed the title fix: make secretRef configurable and backwards-compatible Make secretRef configurable and backwards-compatible Mar 17, 2021
@phillebaba phillebaba changed the title Make secretRef configurable and backwards-compatible Make secretRef configurable Mar 17, 2021
@phillebaba phillebaba changed the title Make secretRef configurable Make secret ref configurable Mar 17, 2021
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.

flux_sync: SecretRef should not be the same as resource name
2 participants