8000 fix: Honor ignore-conflicts even if force-apply is active for a field by codablock · Pull Request #387 · kluctl/kluctl · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: Honor ignore-conflicts even if force-apply is active for a field #387

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Mar 29, 2023
Merged

fix: Honor ignore-conflicts even if force-apply is active for a field #387

merged 1 commit into from
Mar 29, 2023

Conversation

codablock
Copy link
Collaborator

Description

When an object has kluctl.io/force-apply: true and kluctl.io/ignore-conflics-field: my.field set at the same time, the ignore-conflict directive should have higher priority.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • This change requires a new example

@codablock codablock merged commit 01c1318 into main Mar 29, 2023
codablock added a commit that referenced this pull request Mar 29, 2023
@codablock
fix: Honor ignore-conflicts even if force-apply is active for a field (…
7a2c27f 
…#387)
@codablock codablock deleted the fix-force-apply-ignore-conflicts branch March 29, 2023 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@codablock
0