Bug 1977383: [release-4.7] Fix watch conformance test

[marun]

Pick upstream fix from 1.20 (kubernetes#101981) for watch consistency test failure that is made persistent by the service ca configmap publication proposed by #834.

This fix needs to be merged into origin before it will take effect.

/cc @sttts @s-urbaniak @soltysh

[openshift-ci]

@marun: This pull request references Bugzilla bug 1977383, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.7.z) matches configured target release for branch (4.7.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1946479 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
• dependent Bugzilla bug 1946479 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla ([email protected]), skipping review request.

Details

In response to this:

Bug 1977383: [release-4.7] Fix watch conformance test

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.

[openshift-ci-robot]

@marun: the contents of this pull request could be automatically validated.

The following commits are valid:

• 1bb350d|UPSTREAM: 101981: Make watch order conformance test reliable: the upstream PR kubernetes/kubernetes#101981 has merged

[s-urbaniak]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marun, s-urbaniak

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:

• DOWNSTREAM_OWNERS [marun]

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

[openshift-ci]

@marun: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

• openshift/kubernetes#834 is open

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with /bugzilla refresh.

Bugzilla bug 1977383 has not been moved to the MODIFIED state.

Details

In response to this:

Bug 1977383: [release-4.7] Fix watch conformance test

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.

[sdodson]

Test only change required of another functional change, applying cherry-pick-approved