Merge pull request #68159 from saad-ali/csiClusterRegFix

Automatic merge from submit-queue (batch tested with PRs 66840, 68159). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

CSI Cluster Registry and Node Info CRDs Improvements

**What this PR does / why we need it**:
kubernetes/kubernetes#67803 merged before I could address @lavalamp's feedback. This PR addresses his feedback

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Follow up on PR kubernetes/kubernetes#67803

**Special notes for your reviewer**:

**Release note**:

```release-note

```

/assign @lavalamp
/assign @thockin

CC @jsafrane @vladimirvivien @verult @gnufied @childsb

Kubernetes-commit: 416f63c050d01fe831d532d89e29d01093d9c127