Merge pull request #1733 from openstack-k8s-operators/osprh-17457-openstackdataplaneservice_overrides_labels

openshift-merge-bot[bot] · web-flow · commit 8968c97bf537 · 2025-12-16T23:22:34.000Z
Fix: overriding any existing label without checking if they may exist
diff --git a/api/dataplane/v1beta1/openstackdataplaneservice_types.go b/api/dataplane/v1beta1/openstackdataplaneservice_types.go
@@ -166,7 +166,9 @@ func (r *OpenStackDataPlaneService) DefaultLabels() {
 		r.Labels = labels
 	} else {
 		for k, v := range labels {
-			r.Labels[k] = v
+			if _, ok := r.Labels[k]; !ok {
+					r.Labels[k] = v
+			}
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,9 @@ func (r *OpenStackDataPlaneService) DefaultLabels() {`
`166`	`166`	`r.Labels = labels`
`167`	`167`	`} else {`
`168`	`168`	`for k, v := range labels {`
`169`		`- r.Labels[k] = v`
	`169`	`+ if _, ok := r.Labels[k]; !ok {`
	`170`	`+ r.Labels[k] = v`
	`171`	`+ }`
`170`	`172`	`}`
`171`	`173`	`}`
`172`	`174`	`}`