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

fix: newconfig always overwrote feature map #2203

Merged
merged 1 commit into from
Oct 3, 2023
Merged

fix: newconfig always overwrote feature map #2203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/config/config.go
View file
Open in desktop
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