Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

get ChangeSet from outside of paths if manifest generation is enabled #3022

Merged
merged 4 commits into from
May 25, 2020

Conversation

ordovicia
Copy link
Contributor

@ordovicia ordovicia commented Apr 24, 2020

getChangeSet() in pkg/daemon/sync.go now does not consider target paths
while identifying what series of commits changed files Flux is watching
when the manifest generation is enabled.

With manifest generation enabled, Kubernetes resources can be modified
by changes in files outside of target paths.
getChangeSet() now conservatively identifies commits that may have
changed resources when the manifest generation is enabled.

Fixes #3018

ordovicia added a commit to ordovicia/flux that referenced this pull request Apr 27, 2020
ordovicia added a commit to ordovicia/flux that referenced this pull request Apr 27, 2020
ordovicia added a commit to ordovicia/flux that referenced this pull request Apr 27, 2020
ordovicia added a commit to ordovicia/flux that referenced this pull request Apr 27, 2020
@ordovicia ordovicia marked this pull request as ready for review April 27, 2020 07:40
@ordovicia
Copy link
Contributor Author

@hiddeco @stefanprodan Could you please take a look at this and #3039? Thank you.

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

@stefanprodan stefanprodan requested a review from squaremo May 12, 2020 04:46
Copy link
Member

@squaremo squaremo left a comment

Choose a reason for hiding this comment

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

This is a useful and tidy change, thank you. Is it superseded by #3039?

@ordovicia
Copy link
Contributor Author

Is it superseded by #3039?

No, this PR and #3039 are independent and they address different issues.

@ordovicia
Copy link
Contributor Author

@squaremo This PR is ready for merge. Is there anything I am supposed to do?

ordovicia added 4 commits May 25, 2020 12:51
getChangeSet() in pkg/daemon/sync.go now does not consider target paths
while identifying what series of commits changed files Flux is watching
when the manifest generation is enabled.

With manifest generation enabled, kubernetes resources can be modified
by changes in files outside of target paths.
getChangeSet() now conservatively identifies commits that may have
changed resources when the manifest generation is enabled.
@hiddeco hiddeco merged commit bb83626 into fluxcd:master May 25, 2020
@ordovicia ordovicia deleted the fix-3018 branch May 25, 2020 11:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flux overlooks commits that modifies Kustomize base manifests
4 participants