Skip to content

Commit ecacd65

Browse files
authored
Merge pull request #281 from justinsb/overwrite_flag
Set Overwrite in ApplyOptions
2 parents 4b84ff9 + 8e3c80d commit ecacd65

File tree

1 file changed

+3
-0
lines changed
  • pkg/patterns/declarative/pkg/applier

1 file changed

+3
-0
lines changed

pkg/patterns/declarative/pkg/applier/direct.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ func (d *DirectApplier) Apply(ctx context.Context, opt ApplierOptions) error {
134134
ValidationDirective: metav1.FieldValidationStrict,
135135
Mapper: opt.RESTMapper,
136136
DynamicClient: dynamicClient,
137+
138+
// Automatically resolve conflicts between the modified and live configuration by using values from the modified configuration
139+
Overwrite: true,
137140
}
138141
// TODO this will add the print part at all times.
139142
applyOpts.PostProcessorFn = applyOpts.PrintAndPrunePostProcessor()

0 commit comments

Comments
 (0)