Fix sanitization of DC label (fixes #622) #623
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
olim7t
commented
Mar 21, 2024
| @@ -144,7 +144,7 @@ func (rc *ReconciliationContext) listPVCs() (*corev1.PersistentVolumeClaimList, | |||
| rc.ReqLogger.Info("reconciler::listPVCs") | |||
|
|
|||
| selector := map[string]string{ | |||
| api.DatacenterLabel: rc.Datacenter.Name, | |||
| api.DatacenterLabel: api.CleanLabelValue(rc.Datacenter.DatacenterName()), | |||
There was a problem hiding this comment.
This was probably a bug.
burmanm
reviewed
Mar 22, 2024
| @@ -133,7 +133,7 @@ var _ = Describe(testName, func() { | |||
| wg.Add(1) | |||
| go func() { | |||
| k = kubectl.Logs("-f"). | |||
| WithLabel(fmt.Sprintf("statefulset.kubernetes.io/pod-name=cluster1-%s-r1-sts-0", api.CleanupForKubernetes(dcNameOverride))). | |||
| WithLabel(fmt.Sprintf("statefulset.kubernetes.io/pod-name=cluster1-%s-r1-sts-0", api.CleanLabelValue(dcNameOverride))). | |||
There was a problem hiding this comment.
issue: This is wrong and the test shouldn't pass if we mess up naming of the StatefulSet. The StatefulSet name must adhere to the CleanupForKubernetes process (minimum), not CleanLabelValue as those values are not allowed in the StatefulSet's name.
Although we're polling for label value here, the DNS name of the pod matters. The name defined must match what's in here:
There was a problem hiding this comment.
Ah, my bad, I saw a label and just changed the function, not realizing that the value was actually referencing a resource name. I'll revert this.
|
@burmanm is the |
adejanovski
approved these changes
Mar 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does:
Fix sanitization of DC label
Which issue(s) this PR fixes:
Fixes #622
Checklist