Merge pull request #1886 from openshift-cherrypick-robot/cherry-pick-1849-to-18.0-fr5

openshift-merge-bot[bot] · web-flow · commit bad54ec60ebb · 2026-04-14T14:30:14.000Z
[18.0-fr5] Fix stale SecretHashes on nodeset status after node removal
diff --git a/internal/controller/dataplane/openstackdataplanenodeset_controller.go b/internal/controller/dataplane/openstackdataplanenodeset_controller.go
@@ -592,6 +592,9 @@ func checkDeployment(ctx context.Context, helper *helper.Helper,
 			for k, v := range deployment.Status.ConfigMapHashes {
 				instance.Status.ConfigMapHashes[k] = v
 			}
+			if len(deployment.Spec.ServicesOverride) == 0 {
+				instance.Status.SecretHashes = make(map[string]string, len(deployment.Status.SecretHashes))
+			}
 			for k, v := range deployment.Status.SecretHashes {
 				instance.Status.SecretHashes[k] = v
 			}

Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,9 @@ func checkDeployment(ctx context.Context, helper *helper.Helper,`
`592`	`592`	`for k, v := range deployment.Status.ConfigMapHashes {`
`593`	`593`	`instance.Status.ConfigMapHashes[k] = v`
`594`	`594`	`}`
	`595`	`+ if len(deployment.Spec.ServicesOverride) == 0 {`
	`596`	`+ instance.Status.SecretHashes = make(map[string]string, len(deployment.Status.SecretHashes))`
	`597`	`+ }`
`595`	`598`	`for k, v := range deployment.Status.SecretHashes {`
`596`	`599`	`instance.Status.SecretHashes[k] = v`
`597`	`600`	`}`