Skip to content

Commit b5023ec

Browse files
committed
fix: sync the routing.annotations property
Signed-off-by: Guilhem Bonnefille <guilhem.bonnefille@csgroup.eu>
1 parent 1000cd3 commit b5023ec

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

pkg/config/sync.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ func mergeConfig(from, to *controller.OperatorConfiguration) {
256256
if from.Routing.DefaultRoutingClass != "" {
257257
to.Routing.DefaultRoutingClass = from.Routing.DefaultRoutingClass
258258
}
259+
if from.Routing.Annotations != nil {
260+
to.Routing.Annotations = from.Routing.Annotations
261+
}
259262
if from.Routing.ClusterHostSuffix != "" {
260263
to.Routing.ClusterHostSuffix = from.Routing.ClusterHostSuffix
261264
}
@@ -387,6 +390,9 @@ func GetCurrentConfigString(currConfig *controller.OperatorConfiguration) string
387390
routing := currConfig.Routing
388391
var config []string
389392
if routing != nil {
393+
if routing.Annotations != nil && len(routing.Annotations) > 0 {
394+
config = append(config, fmt.Sprintf("routing.Annotations=%s", routing.Annotations))
395+
}
390396
if routing.ClusterHostSuffix != "" && routing.ClusterHostSuffix != defaultConfig.Routing.ClusterHostSuffix {
391397
config = append(config, fmt.Sprintf("routing.clusterHostSuffix=%s", routing.ClusterHostSuffix))
392398
}

0 commit comments

Comments
 (0)