Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-35300: Azure: add Azure specific dnsmasq ordering #4404

Merged

Conversation

yuqi-zhang
Copy link
Contributor

In 4.14 we slightly tweaked the services such that mcd-pull no longer depends on network-online.target. This broke some ARO disconnected environments that needed dnsmasq to be ready before the MCD-pull runs on firstboot.

Add in a new Azure template for MCD-pull with an additional After=dnsmasq.service so the strict ordering of:

  1. ovs-configuration
  2. dnsmasq
  3. mcd-pull
  4. mcd-firstboot

is adhered to.

- What I did

- How to verify it

- Description for the changelog

In 4.14 we slightly tweaked the services such that mcd-pull no longer
depends on network-online.target. This broke some ARO disconnected
environments that needed dnsmasq to be ready before the MCD-pull runs on
firstboot.

Add in a new Azure template for MCD-pull with an additional
After=dnsmasq.service so the strict ordering of:

1. ovs-configuration
2. dnsmasq
3. mcd-pull
4. mcd-firstboot

is adhered to.
@openshift-ci-robot openshift-ci-robot added 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 Jun 12, 2024
@openshift-ci-robot
Copy link
Contributor

@yuqi-zhang: This pull request references Jira Issue OCPBUGS-35300, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

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.

In response to this:

In 4.14 we slightly tweaked the services such that mcd-pull no longer depends on network-online.target. This broke some ARO disconnected environments that needed dnsmasq to be ready before the MCD-pull runs on firstboot.

Add in a new Azure template for MCD-pull with an additional After=dnsmasq.service so the strict ordering of:

  1. ovs-configuration
  2. dnsmasq
  3. mcd-pull
  4. mcd-firstboot

is adhered to.

- What I did

- How to verify it

- Description for the changelog

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.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2024
@yuqi-zhang
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jun 12, 2024
@openshift-ci-robot
Copy link
Contributor

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 12, 2024
@openshift-ci openshift-ci bot requested a review from sergiordlr June 12, 2024 00:35
@sinnykumari
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2024
Copy link
Contributor

openshift-ci bot commented Jun 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sinnykumari, yuqi-zhang

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [sinnykumari,yuqi-zhang]

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

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 0278c48 and 2 for PR HEAD a5dcc6f in total

Copy link
Contributor

openshift-ci bot commented Jun 12, 2024

@yuqi-zhang: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-op-techpreview a5dcc6f link false /test e2e-gcp-op-techpreview

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.

@openshift-merge-bot openshift-merge-bot bot merged commit fc878b8 into openshift:master Jun 12, 2024
16 of 17 checks passed
@openshift-ci-robot
Copy link
Contributor

@yuqi-zhang: Jira Issue OCPBUGS-35300: All pull requests linked via external trackers have merged:

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

In response to this:

In 4.14 we slightly tweaked the services such that mcd-pull no longer depends on network-online.target. This broke some ARO disconnected environments that needed dnsmasq to be ready before the MCD-pull runs on firstboot.

Add in a new Azure template for MCD-pull with an additional After=dnsmasq.service so the strict ordering of:

  1. ovs-configuration
  2. dnsmasq
  3. mcd-pull
  4. mcd-firstboot

is adhered to.

- What I did

- How to verify it

- Description for the changelog

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.

@yuqi-zhang
Copy link
Contributor Author

/cherry-pick release-4.16

@openshift-cherrypick-robot

@yuqi-zhang: new pull request created: #4406

In response to this:

/cherry-pick release-4.16

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-config-operator-container-v4.17.0-202406121741.p0.gfc878b8.assembly.stream.el9 for distgit ose-machine-config-operator.
All builds following this will include this PR.

@wking
Copy link
Member

wking commented Jun 17, 2024

#4411 is up suggesting we revert this change.

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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants