Skip to content

adding missing components allowed for infrastructure nodes #29625

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.

Sign up for GitHub

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

Jump to bottom
Merged
ahardin-rh merged 1 commit into from
Mar 10, 2021
Merged

adding missing components allowed for infrastructure nodes #29625

ahardin-rh merged 1 commit into from
Mar 10, 2021

Conversation

@ahardin-rh
Copy link
Contributor

@ahardin-rh ahardin-rh commented Feb 19, 2021

Continuing the work of #26920

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 19, 2021
@ahardin-rh ahardin-rh self-assigned this Feb 19, 2021
@netlify
Copy link

netlify bot commented Feb 19, 2021 •
edited
Loading

Deploy preview for osdocs ready!

Built with commit 1cbe64a

https://deploy-preview-29625--osdocs.netlify.app

@ahardin-rh ahardin-rh added this to the Next Release milestone Feb 19, 2021
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 19, 2021
@ahardin-rh ahardin-rh requested a review from dmesser February 19, 2021 21:20
@ahardin-rh
Copy link
Contributor Author

ahardin-rh commented Feb 19, 2021

@dmesser @vagnerfarias PTAL. Thank you!

@ahardin-rh
Copy link
Contributor Author

ahardin-rh commented Feb 19, 2021

@vagnerfarias I know you had some other content suggestions; I am reviewing your notes and will open a new PR with those suggestions as well. Thank you!

@ahardin-rh ahardin-rh mentioned this pull request Feb 19, 2021
Closed
@ahardin-rh
Copy link
Contributor Author

ahardin-rh commented Mar 4, 2021

@dmesser @vagnerfarias PTAL

@dmesser
Copy link

dmesser commented Mar 8, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2021
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 10, 2021

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 10, 2021
kalexand-rh
kalexand-rh reviewed Mar 10, 2021
View reviewed changes
Copy link
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

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

I have a suggestion, but this LGTM.

modules/infrastructure-components.adoc Outdated
Copy link
Contributor

@kalexand-rh kalexand-rh Mar 10, 2021

Choose a reason for hiding this comment

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

Maybe:

Suggested change
The following is the list of eligible infrastructure workloads that do not incur {product-title} worker subscriptions.
The following infrastructure workloads do not incur {product-title} worker subscriptions:

@kalexand-rh kalexand-rh added the peer-review-done Signifies that the peer review team has reviewed this PR label Mar 10, 2021
@ahardin-rh ahardin-rh merged commit 284fa03 into openshift:master Mar 10, 2021
@ahardin-rh
Copy link
Contributor Author

ahardin-rh commented Mar 10, 2021

/cherrypick enterprise-4.8

@ahardin-rh
Copy link
Contributor Author

ahardin-rh commented Mar 10, 2021

/cherrypick enterprise-4.7

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 10, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 10, 2021

@ahardin-rh: new pull request created: #30327

Details

In response to this:

/cherrypick enterprise-4.8

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 openshift-cherrypick-robot mentioned this pull request Mar 10, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 10, 2021

@ahardin-rh: new pull request created: #30328

Details

In response to this:

/cherrypick enterprise-4.7

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.

@ahardin-rh
Copy link
Contributor Author

ahardin-rh commented Mar 10, 2021

/cherrypick enterprise-4.6

@ahardin-rh
Copy link
Contributor Author

ahardin-rh commented Mar 10, 2021

/cherrypick enterprise-4.5

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 10, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 10, 2021

@ahardin-rh: new pull request created: #30329

Details

In response to this:

/cherrypick enterprise-4.6

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

openshift-cherrypick-robot commented Mar 10, 2021

@ahardin-rh: #29625 failed to apply on top of branch "enterprise-4.5":

Applying: adding missing components allowed for infrastructure nodes
Using index info to reconstruct a base tree...
M	modules/infrastructure-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-components.adoc
CONFLICT (content): Merge conflict in modules/infrastructure-components.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 adding missing components allowed for infrastructure nodes
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 enterprise-4.5

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.

@ahardin-rh ahardin-rh mentioned this pull request Mar 10, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kalexand-rh kalexand-rh kalexand-rh left review comments

@aburdenthehand aburdenthehand Awaiting requested review from aburdenthehand

@codyhoag codyhoag Awaiting requested review from codyhoag

@jeana-redhat jeana-redhat Awaiting requested review from jeana-redhat

@vikram-redhat vikram-redhat Awaiting requested review from vikram-redhat

+1 more reviewer

@dmesser dmesser dmesser approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@dmesser dmesser

@ahardin-rh ahardin-rh

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

6 participants

@ahardin-rh @dmesser @openshift-ci-robot @openshift-cherrypick-robot @kalexand-rh @vagnerfarias