Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #920

/assign petr-muller

deads2k added 3 commits April 5, 2023 14:41
The kubelet consistently resolves the name.  This change allows the CVO
to use the kubelet's DNS configuration.
Globals cause problems for unit tests (demonstrated in some of the unit
tests) and prevent general reuse.  The anti-pattern is avoided in
kuberentes code and should be OCP as well.  This updates to providing a
configured condition registry without init blocks and provides a
standard clustercondition registry for each consumption.
We do this so that our host-network pod can use the node's resolv.conf to resolve the internal load balancer name
on the pod before DNS pods are available and before the service network is available.  The side effect is that
the CVO cannot resolve service DNS names.
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-3783 has been cloned as Jira Issue OCPBUGS-11435. Will retitle bug to link to clone.
/retitle [release-4.13] OCPBUGS-11435: Update dnsPolicy to allow consistent resolution of the internal LB

Details

In response to this:

This is an automated cherry-pick of #920

/assign petr-muller

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 openshift-ci bot changed the title [release-4.13] OCPBUGS-3783: Update dnsPolicy to allow consistent resolution of the internal LB [release-4.13] OCPBUGS-11435: Update dnsPolicy to allow consistent resolution of the internal LB Apr 5, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 5, 2023
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-11435, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #920

/assign petr-muller

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
Copy link
Contributor

openshift-ci bot commented Apr 5, 2023

@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

[release-4.13] OCPBUGS-11435: Update dnsPolicy to allow consistent resolution of the internal LB

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 openshift-ci bot requested review from DavidHurta and wking April 5, 2023 14:42
@petr-muller
Copy link
Member

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 5, 2023
@openshift-ci-robot
Copy link
Contributor

@petr-muller: This pull request references Jira Issue OCPBUGS-11435, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.0) matches configured target version for branch (4.13.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-3783 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-3783 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
  • bug has dependents

Requesting review from QA contact:
/cc @jiajliu

Details

In response to this:

/jira refresh

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 openshift-ci bot requested a review from jiajliu April 5, 2023 14:46
@petr-muller
Copy link
Member

/retest

@neisw
Copy link
Contributor

neisw commented Apr 10, 2023

/payload-job periodic-ci-openshift-release-master-ci-4.13-e2e-gcp-sdn-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 10, 2023

@neisw: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-ci-4.13-e2e-gcp-sdn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d6b58370-d7d1-11ed-8920-f83819902f0b-0

@neisw
Copy link
Contributor

neisw commented Apr 10, 2023

/payload-job periodic-ci-openshift-release-master-nightly-4.13-e2e-gcp-ovn-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 10, 2023

@neisw: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.13-e2e-gcp-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/66988910-d7d2-11ed-97de-97e22f458ac0-0

@neisw
Copy link
Contributor

neisw commented Apr 10, 2023

/payload-aggregate periodic-ci-openshift-release-master-nightly-4.13-e2e-gcp-ovn-upgrade 5

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 10, 2023

@neisw: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.13-e2e-gcp-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b220a150-d7ec-11ed-9495-bc13f89bb9ab-0

@petr-muller
Copy link
Member

/test e2e-agnostic-ovn-upgrade-into-change

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 11, 2023

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@petr-muller
Copy link
Member

/cherry-pick release-4.12

@openshift-cherrypick-robot
Copy link
Author

@petr-muller: once the present PR merges, I will cherry-pick it on top of release-4.12 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.12

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.

@shellyyang1989
Copy link
Contributor

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Apr 13, 2023
@petr-muller
Copy link
Member

/hold

  1. We want to hold this until the 4.14 has a chance to soak
  2. We want to hold this while TRT is looking into things

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 13, 2023
@sdodson
Copy link
Member

sdodson commented Apr 18, 2023

/hold cancel
Based on discussion w/ TRT team who suggested we move forward.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 18, 2023
@petr-muller
Copy link
Member

/hold cancel

The change caused no problems in 4.14 and TRT are fine with merging it

@LalatenduMohanty
Copy link
Member

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 18, 2023
@sdodson sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 18, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 18, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, petr-muller

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 18, 2023
@openshift-merge-robot openshift-merge-robot merged commit e08a279 into openshift:release-4.13 Apr 18, 2023
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-11435: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-11435 has been moved to the MODIFIED state.

Details

In response to this:

This is an automated cherry-pick of #920

/assign petr-muller

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-cherrypick-robot
Copy link
Author

@petr-muller: #923 failed to apply on top of branch "release-4.12":

Applying: Update dnsPolicy to allow consistent resolution of the internal LB
Applying: replace global clustercondition registry with instance based approach
Using index info to reconstruct a base tree...
M	pkg/cincinnati/cincinnati.go
M	pkg/cincinnati/cincinnati_test.go
M	pkg/cvo/availableupdates.go
M	pkg/cvo/cvo.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cvo/cvo.go
Auto-merging pkg/cvo/availableupdates.go
CONFLICT (content): Merge conflict in pkg/cvo/availableupdates.go
Auto-merging pkg/cincinnati/cincinnati_test.go
CONFLICT (content): Merge conflict in pkg/cincinnati/cincinnati_test.go
Auto-merging pkg/cincinnati/cincinnati.go
CONFLICT (content): Merge conflict in pkg/cincinnati/cincinnati.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 replace global clustercondition registry with instance based approach
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.12

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-merge-robot
Copy link
Contributor

Fix included in accepted release 4.13.0-0.nightly-2023-04-27-232707

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants