Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
fix: newconfig always overwrote feature map (#2203)
Browse files Browse the repository at this point in the history
  • Loading branch information
iwilltry42 committed Oct 3, 2023
1 parent 635ea0a commit 84a3c3b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,9 @@ func merge(oldConfig, newConfig *apiv1.Config) *apiv1.Config {
mergedConfig.CertManagerIssuer = newConfig.CertManagerIssuer
}
if newConfig.Features != nil {
mergedConfig.Features = newConfig.Features
for k, v := range newConfig.Features {
mergedConfig.Features[k] = v
}
}

if len(newConfig.PropagateProjectAnnotations) > 0 && newConfig.PropagateProjectAnnotations[0] == "" {
Expand Down

0 comments on commit 84a3c3b

Please sign in to comment.