OCPBUGS-18304: for vsphere ipi add cluster domain to the uploaded vm configs so that… #7451
Conversation
… 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>
|
/cc @jcpowermac |
|
/lgtm |
|
/cherrypick release-4.13 |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jcpowermac 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 |
openshift-ci
bot
added
the
approved
|
@vrutkovs: once the present PR merges, I will cherry-pick it on top of release-4.13 in a new PR and assign it to you. In response to this:
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
added
jira/valid-reference
|
@vrutkovs: This pull request references Jira Issue OCPBUGS-18304, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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. |
|
not quite sure why that failed... |
|
/test e2e-vsphere-ovn |
1 similar comment
|
/test e2e-vsphere-ovn |
|
/jira refresh The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity. |
openshift-ci-robot
added
jira/invalid-bug
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-18304, which is invalid:
Comment In response to this:
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. |
|
/jira refresh |
openshift-ci-robot
added
the
jira/valid-bug
|
@vrutkovs: This pull request references Jira Issue OCPBUGS-18304, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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
removed
the
jira/invalid-bug
|
/label acknowledge-critical-fixes-only |
openshift-ci
bot
added
the
acknowledge-critical-fixes-only
|
/cherrypick release-4.14 |
|
@vrutkovs: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you. In response to this:
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. |
|
@vrutkovs: all tests passed! 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: Jira Issue OCPBUGS-18304: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-18304 has been moved to the MODIFIED state. In response to this:
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. |
|
@vrutkovs: #7451 failed to apply on top of branch "release-4.13": In response to this:
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. |
|
@vrutkovs: new pull request created: #7477 In response to this:
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. |
|
Fix included in accepted release 4.15.0-0.nightly-2023-09-14-125123 |
|
Fix included in accepted release 4.15.0-0.nightly-2023-09-15-090049 |
|
Fix included in accepted release 4.15.0-0.nightly-2023-09-16-110027 |
… 30-local-dns-prepender can use it
Fixes okd-project/okd#1715
This re-adds domain setting from #5788 removed in #6770