Skip to content

[release-4.14] OCPBUGS-18719: for vsphere ipi add cluster domain to the uploaded vm configs so that…#7477

Merged
openshift-merge-robot merged 1 commit into
openshift:release-4.14from
openshift-cherrypick-robot:cherry-pick-7451-to-release-4.14
Sep 14, 2023
Merged

[release-4.14] OCPBUGS-18719: for vsphere ipi add cluster domain to the uploaded vm configs so that…#7477
openshift-merge-robot merged 1 commit into
openshift:release-4.14from
openshift-cherrypick-robot:cherry-pick-7451-to-release-4.14

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #7451

/assign vrutkovs

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

@openshift-cherrypick-robot: Jira Issue OCPBUGS-18304 has been cloned as Jira Issue OCPBUGS-18719. Will retitle bug to link to clone.
/retitle [release-4.14] OCPBUGS-18719: for vsphere ipi add cluster domain to the uploaded vm configs so that…

Details

In response to this:

This is an automated cherry-pick of #7451

/assign vrutkovs

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.14] OCPBUGS-18304: for vsphere ipi add cluster domain to the uploaded vm configs so that… [release-4.14] OCPBUGS-18719: for vsphere ipi add cluster domain to the uploaded vm configs so that… Sep 8, 2023
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 8, 2023
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-18719, 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.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-18304 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-18304 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @gpei

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 #7451

/assign vrutkovs

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.

@jcpowermac
Copy link
Copy Markdown
Contributor

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 8, 2023

[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

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 Sep 8, 2023
@vrutkovs
Copy link
Copy Markdown
Contributor

vrutkovs commented Sep 8, 2023

/cherrypick release-4.13

@openshift-cherrypick-robot
Copy link
Copy Markdown
Author

@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.

Details

In response to this:

/cherrypick release-4.13

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

openshift-ci Bot commented Sep 8, 2023

@openshift-cherrypick-robot: 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/okd-scos-e2e-gcp a237d09 link false /test okd-scos-e2e-gcp
ci/prow/e2e-aws-ovn-disruptive a237d09 link false /test e2e-aws-ovn-disruptive
ci/prow/okd-scos-e2e-gcp-ovn-upgrade a237d09 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/okd-scos-e2e-vsphere a237d09 link false /test okd-scos-e2e-vsphere

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.

@sadasu
Copy link
Copy Markdown
Contributor

sadasu commented Sep 13, 2023

/retest-required

@sadasu
Copy link
Copy Markdown
Contributor

sadasu commented Sep 13, 2023

/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 Sep 13, 2023
@gpei
Copy link
Copy Markdown
Contributor

gpei commented Sep 14, 2023

/label cherry-pick-approved

@openshift-ci openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 14, 2023
@openshift-merge-robot openshift-merge-robot merged commit a10d9ce into openshift:release-4.14 Sep 14, 2023
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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

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

Details

In response to this:

This is an automated cherry-pick of #7451

/assign vrutkovs

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
Copy Markdown
Author

@vrutkovs: #7477 failed to apply on top of branch "release-4.13":

Applying: for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it
Using index info to reconstruct a base tree...
M	data/data/vsphere/bootstrap/main.tf
Falling back to patching base and 3-way merge...
Auto-merging data/data/vsphere/bootstrap/main.tf
CONFLICT (content): Merge conflict in data/data/vsphere/bootstrap/main.tf
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 for vsphere ipi add cluster domain to the uploaded vm configs so that 30-local-dns-prepender can use it
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:

/cherrypick release-4.13

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

Fix included in accepted release 4.14.0-0.nightly-2023-09-15-101929

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.

8 participants