openshift / machine-config-operator

Apache License 2.0
245 stars 401 forks source link

[release-4.14] OCPBUGS-34716: If multiple hostnames are returned, use the first one for the Node name #4385

Closed openshift-cherrypick-robot closed 2 months ago

openshift-cherrypick-robot commented 3 months ago

This is an automated cherry-pick of #4373

/assign JoelSpeed

/cherrypick release-4.13 release-4.12

openshift-ci-robot commented 3 months ago

@openshift-cherrypick-robot: Jira Issue OCPBUGS-33847 has been cloned as Jira Issue OCPBUGS-34716. Will retitle bug to link to clone. /retitle [release-4.14] OCPBUGS-34716: If multiple hostnames are returned, use the first one for the Node name

In response to [this](https://github.com/openshift/machine-config-operator/pull/4385): >This is an automated cherry-pick of #4373 > >/assign JoelSpeed > >/cherrypick release-4.13 release-4.12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 3 months ago

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-34716, 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.

In response to [this](https://github.com/openshift/machine-config-operator/pull/4385): >This is an automated cherry-pick of #4373 > >/assign JoelSpeed > >/cherrypick release-4.13 release-4.12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
JoelSpeed commented 2 months ago

/jira refresh

openshift-ci-robot commented 2 months ago

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

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.14.z) matches configured target version for branch (4.14.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-33847](https://issues.redhat.com//browse/OCPBUGS-33847) is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-33847](https://issues.redhat.com//browse/OCPBUGS-33847) targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z * bug has dependents

Requesting review from QA contact: /cc @sunzhaohua2

In response to [this](https://github.com/openshift/machine-config-operator/pull/4385#issuecomment-2157791040): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
sinnykumari commented 2 months ago

/lgtm /approve /label backport-risk-assessed

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

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

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](https://github.com/openshift/machine-config-operator/blob/release-4.14/OWNERS)~~ [sinnykumari] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
sergiordlr commented 2 months ago

/label cherry-pick-approved

openshift-ci-robot commented 2 months ago

/retest-required

Remaining retests: 0 against base HEAD a50e9b05e3dbe0e2a0370ca83a7bcf4ac72d4e67 and 2 for PR HEAD f8d88e8e602c69bfece460f52d6eced00c5eff3c in total

JoelSpeed commented 2 months ago

/retest-required

JoelSpeed commented 2 months ago

/retest

JoelSpeed commented 2 months ago

/retest-required

openshift-ci[bot] commented 2 months ago

@openshift-cherrypick-robot: 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/okd-scos-e2e-aws-ovn f8d88e8e602c69bfece460f52d6eced00c5eff3c link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
openshift-ci-robot commented 2 months ago

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

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

In response to [this](https://github.com/openshift/machine-config-operator/pull/4385): >This is an automated cherry-pick of #4373 > >/assign JoelSpeed > >/cherrypick release-4.13 release-4.12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fmachine-config-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-cherrypick-robot commented 2 months ago

@openshift-cherrypick-robot: #4385 failed to apply on top of branch "release-4.13":

Applying: If multiple hostnames are returned, use the first one for the Node name
Using index info to reconstruct a base tree...
M   templates/common/aws/files/usr-local-bin-aws-kubelet-nodename.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/common/aws/files/usr-local-bin-aws-kubelet-nodename.yaml
CONFLICT (content): Merge conflict in templates/common/aws/files/usr-local-bin-aws-kubelet-nodename.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 If multiple hostnames are returned, use the first one for the Node name
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".
In response to [this](): >This is an automated cherry-pick of #4373 > >/assign JoelSpeed > >/cherrypick release-4.13 release-4.12 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-bot commented 2 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-config-operator-container-v4.14.0-202406121909.p0.g3aec7f3.assembly.stream.el8 for distgit ose-machine-config-operator. All builds following this will include this PR.

openshift-merge-robot commented 2 months ago

Fix included in accepted release 4.14.0-0.nightly-2024-06-13-092412