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.

Sign up for GitHub

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

Jump to bottom

Bug 2076880: for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it #5788

Merged
merged 1 commit into from Apr 21, 2022
Merged

Bug 2076880: for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it #5788

merged 1 commit into from Apr 21, 2022

Conversation

fortinj66
Copy link
Contributor

for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it

Due to changes in FCOS 35 /etc/nsswitch.conf, we need to move the name resolution of api-int. to
systemd-resolved. The way we do this is by adding a Domain attribute to /etc/systemd/resolved.conf.d/60-kni.conf.

Since we are using a slightly different prepender than the masters and workers the domain is not being
discovered automatically. To address this we are adding the domain in data/data/vsphere/bootstrap/main.tf
which gets uploaded to the bootstrap instance on creation.

30-local-dns-prepender then downloads this information and adds it to /etc/systemd/resolved.conf.d/60-kni.conf

Note that we check for a non-empty domain before writing /etc/systemd/resolved.conf.d/60-kni.conf.

Fixes okd-project/okd#1182

Signed-off-by: John Fortin fortinj66@gmail.com

@fortinj66
for vsphere ipi add cluster domain to the uploaded vm configs so that…
5042c9c 
… 30-local-dns-prepender can use it

Due to changes in FCOS 35 /etc/nsswitch.conf, we need to move the name resolution of api-int.<domain> to
systemd-resolved.  The way we do this is by adding a Domain attribute to /etc/systemd/resolved.conf.d/60-kni.conf.

Since we are using a slightly different prepender than the masters and workers the domain is not being
discovered automatically.  To address this we are adding the domain in data/data/vsphere/bootstrap/main.tf
which gets uploaded to the bootstrap instance on creation.

30-local-dns-prepender then downloads this information and adds it to /etc/systemd/resolved.conf.d/60-kni.conf

Note that we check for a non-empty domain before writing /etc/systemd/resolved.conf.d/60-kni.conf.

Fixes okd-project/okd#1182

Signed-off-by: John Fortin <fortinj66@gmail.com>
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 10, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 10, 2022

Hi @fortinj66. Thanks for your PR.

I'm waiting for a openshift 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.

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 jstuever and r4f4 April 10, 2022 13:15
@fortinj66 fortinj66 mentioned this pull request Apr 11, 2022
Closed
@vrutkovs
Copy link
Member

/ok-to-test
/cc @rvanderp3

@openshift-ci openshift-ci bot requested a review from rvanderp3 April 11, 2022 11:52
@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 11, 2022
@jcpowermac
Copy link
Contributor

/test okd-e2e-vsphere

@jcpowermac
Copy link
Contributor

e2e-vsphere failure unrelated to PR changes

@fortinj66
Copy link
Contributor Author

/retest okd-e2e-vsphere

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 11, 2022

@fortinj66: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test e2e-aws
  • /test e2e-metal-ipi-ovn-ipv6-required
  • /test gofmt
  • /test golint
  • /test govet
  • /test images
  • /test okd-images
  • /test okd-unit
  • /test okd-verify-codegen
  • /test openstack-manifests
  • /test shellcheck
  • /test tf-lint
  • /test unit
  • /test verify-codegen
  • /test verify-vendor
  • /test yaml-lint

The following commands are available to trigger optional jobs:

  • /test e2e-alibaba
  • /test e2e-aws-disruptive
  • /test e2e-aws-fips
  • /test e2e-aws-proxy
  • /test e2e-aws-shared-vpc
  • /test e2e-aws-single-node
  • /test e2e-aws-upgrade
  • /test e2e-aws-upi
  • /test e2e-aws-upi-proxy
  • /test e2e-aws-workers-rhel8
  • /test e2e-azure
  • /test e2e-azure-resourcegroup
  • /test e2e-azure-shared-vpc
  • /test e2e-azure-upi
  • /test e2e-azurestack
  • /test e2e-azurestack-upi
  • /test e2e-crc
  • /test e2e-gcp
  • /test e2e-gcp-shared-vpc
  • /test e2e-gcp-upgrade
  • /test e2e-gcp-upi
  • /test e2e-gcp-upi-xpn
  • /test e2e-ibmcloud
  • /test e2e-libvirt
  • /test e2e-metal
  • /test e2e-metal-assisted
  • /test e2e-metal-ipi
  • /test e2e-metal-ipi-ovn-dualstack
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-metal-ipi-swapped-hosts
  • /test e2e-metal-ipi-virtualmedia
  • /test e2e-metal-single-node-live-iso
  • /test e2e-openstack
  • /test e2e-openstack-kuryr
  • /test e2e-openstack-parallel
  • /test e2e-openstack-proxy
  • /test e2e-openstack-upi
  • /test e2e-ovirt
  • /test e2e-vsphere
  • /test e2e-vsphere-upi
  • /test okd-e2e-aws
  • /test okd-e2e-aws-upgrade
  • /test okd-e2e-gcp
  • /test okd-e2e-gcp-upgrade
  • /test okd-e2e-vsphere
  • /test tf-fmt

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-installer-master-e2e-vsphere
  • pull-ci-openshift-installer-master-gofmt
  • pull-ci-openshift-installer-master-golint
  • pull-ci-openshift-installer-master-govet
  • pull-ci-openshift-installer-master-images
  • pull-ci-openshift-installer-master-okd-images
  • pull-ci-openshift-installer-master-okd-unit
  • pull-ci-openshift-installer-master-okd-verify-codegen
  • pull-ci-openshift-installer-master-shellcheck
  • pull-ci-openshift-installer-master-tf-fmt
  • pull-ci-openshift-installer-master-tf-lint
  • pull-ci-openshift-installer-master-unit
  • pull-ci-openshift-installer-master-verify-codegen
  • pull-ci-openshift-installer-master-verify-vendor
  • pull-ci-openshift-installer-master-yaml-lint

In response to this:

/retest okd-e2e-vsphere

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.

@fortinj66
Copy link
Contributor Author

/test okd-e2e-vsphere

@fortinj66
Copy link
Contributor Author

okd-e2e-vsphere failures do not seem related to the PR either

kirankt
kirankt reviewed Apr 20, 2022
View reviewed changes
Copy link
Contributor

@kirankt kirankt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 20, 2022
@vrutkovs
Copy link
Member

/retitle Bug 2076880: for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it

@openshift-ci openshift-ci bot changed the title for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it Bug 2076880: for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it Apr 20, 2022
@openshift-ci openshift-ci bot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Apr 20, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 20, 2022

@fortinj66: This pull request references Bugzilla bug 2076880, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (gpei@redhat.com), skipping review request.

In response to this:

Bug 2076880: for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it

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 added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 20, 2022
@vrutkovs
Copy link
Member

/cherrypick release-4.10

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherrypick release-4.10

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.

@patrickdillon
Copy link
Contributor

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 20, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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:

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 20, 2022
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@fortinj66
Copy link
Contributor Author

/retest-required

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@vrutkovs
Copy link
Member

/refresh

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 21, 2022

@fortinj66: The following tests 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-vsphere 5042c9c link false /test e2e-vsphere
ci/prow/okd-e2e-vsphere 5042c9c link false /test okd-e2e-vsphere
ci/prow/e2e-metal-ipi-ovn-ipv6 5042c9c link true /test e2e-metal-ipi-ovn-ipv6

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

@vrutkovs
Copy link
Member

/skip

@openshift-merge-robot openshift-merge-robot merged commit 8748893 into openshift:master Apr 21, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 21, 2022

@fortinj66: All pull requests linked via external trackers have merged:

Bugzilla bug 2076880 has been moved to the MODIFIED state.

In response to this:

Bug 2076880: for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it

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 openshift-cherrypick-robot mentioned this pull request Apr 21, 2022
Merged
@openshift-cherrypick-robot
Copy link

@vrutkovs: new pull request created: #5827

In response to this:

/cherrypick release-4.10

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.

@fortinj66 fortinj66 deleted the fix-resolve-for-bootstrap branch July 7, 2022 21:14
@fortinj66 fortinj66 mentioned this pull request Jul 8, 2022
Closed
@JaimeMagiera JaimeMagiera mentioned this pull request Dec 19, 2022
Closed
@vrutkovs vrutkovs mentioned this pull request Aug 29, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kirankt kirankt kirankt left review comments

@jstuever jstuever Awaiting requested review from jstuever

@r4f4 r4f4 Awaiting requested review from r4f4

@rvanderp3 rvanderp3 Awaiting requested review from rvanderp3

Assignees

@kirankt kirankt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
No milestone
8 participants
@fortinj66 @vrutkovs @jcpowermac @openshift-cherrypick-robot @patrickdillon @openshift-bot @kirankt @openshift-merge-robot