Skip to content

OCPBUGS-35851#adding missing port details #79494

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

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

brendan-daly-red-hat
Copy link
Contributor

@brendan-daly-red-hat brendan-daly-red-hat commented Jul 25, 2024

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 25, 2024
@brendan-daly-red-hat brendan-daly-red-hat force-pushed the OCPBUGS-35851 branch 2 times, most recently from d8e580c to 63376c6 Compare July 26, 2024 10:09
@brendan-daly-red-hat
Copy link
Contributor Author

@jinyunma, PTAL at this draft update.

@jinyunma
Copy link

jinyunma commented Aug 5, 2024

@brendan-daly-red-hat thanks for addressing this.
LGTM

@brendan-daly-red-hat
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Aug 9, 2024
@xenolinux
Copy link
Contributor

/label peer-review-in-progress

@openshift-ci openshift-ci bot added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Aug 9, 2024
Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

One minor comment; otherwise LGTM

/remove-label peer-review-needed
/remove-label peer-review-in-progress
/label peer-review-done

|`123`
|Network Time Protocol (NTP) on UDP port `123`

If an external NTP time server is configured, you must open UDP port `123`.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
If an external NTP time server is configured, you must open UDP port `123`.
If you configure an external NTP time server, you must open UDP port `123`.

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Aug 9, 2024
Copy link

openshift-ci bot commented Aug 14, 2024

@brendan-daly-red-hat: 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-sigs/prow repository. I understand the commands that are listed here.

@brendan-daly-red-hat
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 14, 2024
@jab-rh jab-rh added this to the Continuous Release milestone Aug 14, 2024
@jab-rh jab-rh merged commit d98cb41 into openshift:main Aug 14, 2024
2 checks passed
@jab-rh
Copy link
Contributor

jab-rh commented Aug 14, 2024

/cherry-pick enterprise-4.17

@jab-rh
Copy link
Contributor

jab-rh commented Aug 14, 2024

/cherry-pick enterprise-4.16

@jab-rh
Copy link
Contributor

jab-rh commented Aug 14, 2024

/cherry-pick enterprise-4.15

@jab-rh
Copy link
Contributor

jab-rh commented Aug 14, 2024

/cherry-pick enterprise-4.14

@openshift-cherrypick-robot

@jab-rh: new pull request created: #80484

In response to this:

/cherry-pick enterprise-4.17

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.

@jab-rh
Copy link
Contributor

jab-rh commented Aug 14, 2024

/cherry-pick enterprise-4.13

@openshift-cherrypick-robot

@jab-rh: #79494 failed to apply on top of branch "enterprise-4.16":

Applying: OCPBUGS-35851:adding missing port details
Using index info to reconstruct a base tree...
M	modules/installation-about-custom-azure-vnet.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-about-custom-azure-vnet.adoc
CONFLICT (content): Merge conflict in modules/installation-about-custom-azure-vnet.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-35851:adding missing port details
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:

/cherry-pick enterprise-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-cherrypick-robot

@jab-rh: #79494 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-35851:adding missing port details
Using index info to reconstruct a base tree...
M	modules/installation-about-custom-azure-vnet.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-about-custom-azure-vnet.adoc
CONFLICT (content): Merge conflict in modules/installation-about-custom-azure-vnet.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-35851:adding missing port details
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:

/cherry-pick enterprise-4.15

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-cherrypick-robot

@jab-rh: #79494 failed to apply on top of branch "enterprise-4.14":

Applying: OCPBUGS-35851:adding missing port details
Using index info to reconstruct a base tree...
M	modules/installation-about-custom-azure-vnet.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-about-custom-azure-vnet.adoc
CONFLICT (content): Merge conflict in modules/installation-about-custom-azure-vnet.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-35851:adding missing port details
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:

/cherry-pick enterprise-4.14

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-cherrypick-robot

@jab-rh: #79494 failed to apply on top of branch "enterprise-4.13":

Applying: OCPBUGS-35851:adding missing port details
Using index info to reconstruct a base tree...
M	modules/installation-about-custom-azure-vnet.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-about-custom-azure-vnet.adoc
CONFLICT (content): Merge conflict in modules/installation-about-custom-azure-vnet.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-35851:adding missing port details
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:

/cherry-pick enterprise-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-sigs/prow repository.

@jab-rh
Copy link
Contributor

jab-rh commented Aug 14, 2024

@brendan-daly-red-hat, looks like this doesn't apply cleanly to 4.16 and prior. Can you manually cherry-pick this? It might cherry-pick back from 4.16 if fixed. Thanks!

@jab-rh jab-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Aug 14, 2024
@jab-rh
Copy link
Contributor

jab-rh commented Aug 22, 2024

@brendan-daly-red-hat thanks!

@jab-rh jab-rh removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants