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.

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

CNV -28700: Update YAMLs and mention default VM route #61905

Merged
merged 1 commit into from
Jul 5, 2023

Conversation

apinnick
Copy link
Contributor

@apinnick apinnick commented Jun 29, 2023

Version(s): 4.12+

Issue: CNV-28700

Link to docs preview: Configure IPs for VMs

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 29, 2023
@apinnick apinnick added this to the Continuous Release milestone Jun 29, 2023
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 29, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jun 29, 2023

🤖 Updated build preview is available at:
https://61905--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/19178

@apinnick apinnick changed the title CNV -28700: Update VM static IP YAML CNV -28700: Update YAMLs and mention default VM route Jun 29, 2023
Signed-off-by: Avital Pinnick <apinnick@redhat.com>
@apinnick apinnick added the peer-review-needed Signifies that the peer review team needs to review this PR label Jul 5, 2023
Copy link
Contributor

@GroceryBoyJr GroceryBoyJr left a comment

Choose a reason for hiding this comment

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

LGTM

@GroceryBoyJr
Copy link
Contributor

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

@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 labels Jul 5, 2023
@GroceryBoyJr
Copy link
Contributor

Nice work, @apinnick !

@apinnick apinnick merged commit 475e284 into openshift:main Jul 5, 2023
1 check passed
@apinnick apinnick deleted the CNV-28700-update-ip-yaml branch July 5, 2023 15:52
@apinnick
Copy link
Contributor Author

apinnick commented Jul 5, 2023

/cherrypick enterprise-4.12

@apinnick
Copy link
Contributor Author

apinnick commented Jul 5, 2023

/cherrypick enterprise-4.13

@apinnick
Copy link
Contributor Author

apinnick commented Jul 5, 2023

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@apinnick: #61905 failed to apply on top of branch "enterprise-4.12":

Applying: CNV -28700: Update VM static IP YAML
Using index info to reconstruct a base tree...
M	modules/virt-configuring-ip-for-new-vm-cloud-init.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/virt-configuring-ip-for-new-vm-cloud-init.adoc
CONFLICT (content): Merge conflict in modules/virt-configuring-ip-for-new-vm-cloud-init.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 CNV -28700: Update VM static IP YAML
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:

/cherrypick enterprise-4.12

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

@apinnick: new pull request created: #62051

In response to this:

/cherrypick 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/test-infra repository.

@openshift-cherrypick-robot

@apinnick: new pull request created: #62052

In response to this:

/cherrypick 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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 CNV Label for all CNV PRs 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.

None yet

5 participants