OCPCLOUD-2880: label selector and labels conversion, fixes to sync controllers and conversions #281
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@damdo: This pull request references OCPCLOUD-2880 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/assign @RadekManak @theobarberbany @JoelSpeed |
|
@damdo: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
| // The conversion does not set a resource version, so we must copy it over | ||
| newMapiMachineSet.SetResourceVersion(util.GetResourceVersion(mapiMachineSet)) | ||
| newMapiMachineSet.OwnerReferences = []metav1.OwnerReference{} // No CAPI machine set owner references are converted to MAPI machine set. | ||
| newMapiMachineSet.Spec.Template.ObjectMeta.Labels = util.MergeMaps(mapiMachineSet.Spec.Template.ObjectMeta.Labels, newMapiMachineSet.Spec.Template.ObjectMeta.Labels) |
There was a problem hiding this comment.
I can't remember, did we decide that we want CAPI labels to be propagated to the MAPI counterpart?
| } | ||
|
|
||
| if diffObjectMeta := deep.Equal(typedInfraMachineTemplate1.ObjectMeta, typedinfraMachineTemplate2.ObjectMeta); len(diffObjectMeta) > 0 { | ||
| diff[".metadata"] = diffObjectMeta |
There was a problem hiding this comment.
how does new approach this print? do we %+v the keys? I found the diff confusing when I was trying to debug some tests.
| if mapiMachine != nil { | ||
| newMapiMachine.SetResourceVersion(util.GetResourceVersion(mapiMachine)) | ||
| newMapiMachine.Spec.Labels = util.MergeMaps(mapiMachine.Spec.Labels, newMapiMachine.Spec.Labels) | ||
| newMapiMachine.Labels = util.MergeMaps(mapiMachine.Labels, newMapiMachine.Labels) | ||
| // newMapiMachine.Spec.Labels = util.MergeMaps(mapiMachine.Spec.Labels, newMapiMachine.Spec.Labels) |
There was a problem hiding this comment.
Do we want a TODO to work this out later? Why have we stopped this with labels? :)
| newCAPIMachine.OwnerReferences = newCAPIOwnerReferences | ||
|
|
||
| if len(newCAPIMachine.OwnerReferences) > 0 { |
| @@ -673,6 +714,9 @@ func (r *MachineSyncReconciler) shouldMirrorCAPIMachineToMAPIMachine(ctx context | |||
| logger.V(4).WithName("shouldMirrorCAPIMachineToMAPIMachine"). | |||
| Info("Checking if Cluster API machine should be mirrored", "machine", machine.GetName()) | |||
|
|
|||
| // TODO: should we check if the CAPI Machine is being deleted and do not bother creating a MAPI Machine mirror? | |||
There was a problem hiding this comment.
I think it's a good idea :)
| return capiSelector | ||
| } | ||
|
|
||
| func convertCAPILabelsToMAPILabels(capiLabels map[string]string) map[string]string { |
There was a problem hiding this comment.
Do we want /need unit tests for these? Are they adequately covered by the existing tests? (forgive me if I've missed them!)
This PR contains:
TODO(docs)for lossy conversions that we might need to document (cc. @jeana-redhat)