fix e2e config map update triggers registry pod rollout failure

[akihikokuroda]

Signed-off-by: akihikokuroda akihikokuroda2020@gmail.com

This change make sure the updated configmap is captured after the owner id is injected. So the the revision id injected into the pod matches the revision id of the configmap

Closes #2531
Description of the change:
It doesn't seem a very good way but I can reproduce this failure by making this change.

--- a/pkg/controller/operators/catalog/operator.go
+++ b/pkg/controller/operators/catalog/operator.go
@@ -648,7 +648,7 @@ func (o *Operator) syncConfigMap(logger *logrus.Entry, in *v1alpha1.CatalogSourc
                return
        }
 
-       if wasOwned := ownerutil.EnsureOwner(configMap, in); !wasOwned || updateLabel {
+       if wasOwned := ownerutil.EnsureOwner(configMap, in); (in.Status.ConfigMapResource != nil && !in.Status.ConfigMapResource.IsAMatch(&configMap.ObjectMeta)) && (!wasOwned || updateLabel) {
                configMap, err = o.opClient.KubernetesInterface().CoreV1().ConfigMaps(configMap.GetNamespace()).Update(context.TODO(), configMap, metav1.UpdateOptions{})
                if err != nil {
                        syncError = fmt.Errorf("unable to write owner onto catalog source configmap - %v", err)

Motivation for the change:

Reviewer Checklist

• Implementation matches the proposed design, or proposal is updated to match implementation
• Sufficient unit test coverage
• Sufficient end-to-end test coverage
• Docs updated or added to /doc
• Commit messages sensible and descriptive

[openshift-ci]

Hi @akihikokuroda. Thanks for your PR.

I'm waiting for a operator-framework member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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/test-infra repository.

[awgreene]

Thanks for improving our e2e test suite @akihikokuroda! I'm not particularly familiar with this test, but based on the issue reported in #2531, this fix seems appropriate. I had one small nit on implementation.

[timflannagan]

/ok-to-test

[timflannagan]

/lgtm

[awgreene]

Great work @akihikokuroda, approved.

[awgreene]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akihikokuroda, awgreene

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [awgreene]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[timflannagan]

@akihikokuroda Unfortunately, it looks like you'll need to rebase this to make branch protection happy 😞