janhoy commented on PR #888:
URL: https://github.com/apache/solr-operator/pull/888#issuecomment-7026152062

   🤖 I merged the latest `main` into this branch and reworked the fix on top of 
it.
   
   Since this PR was opened, #827 added `reconcileStorageFinalizerForDeletion` 
to `main`. It is almost the same helper as `reconcileDeletion` here, but it was 
only called when a SolrCloud's Solr version is unsupported, so the #828 case 
was still broken. The merge conflicted at the top of `Reconcile`, so I resolved 
it like this:
   
   - Any SolrCloud being deleted now goes straight to 
`reconcileStorageFinalizerForDeletion`, before the Solr version check. A 
missing `providedConfigMap` or an unsupported Solr version can no longer block 
deletion.
   - `reconcileDeletion` is removed in favour of the existing helper, which 
builds the PVC selector with `util.SolrCloudSelectorLabels` rather than by 
hand. The only difference is that `reconcileDeletion` returned early when the 
storage finalizer was absent; `reconcileStorageFinalizer` is already a no-op in 
that case.
   - The tests are kept as they were, except that `createClaims` now uses 
`util.SolrCloudSelectorLabels` for the data PVC labels.
   - The changelog entry is kept, after the entries that landed on `main` in 
the meantime.
   
   Both new specs still fail against `main`'s controller and pass with this 
change. `make test` passes, as do `check-format`, `vet`, `check-helm`, 
`check-manifests`, `check-generated` and `check-mod`.
   
   The PR description still refers to `reconcileDeletion`, which no longer 
exists.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to