Skip to content

BZ2022560: Adds m6i AWS EC2 instance#38872

Merged
lpettyjo merged 1 commit intoopenshift:mainfrom
opayne1:BZ2022560
Dec 16, 2021
Merged

BZ2022560: Adds m6i AWS EC2 instance#38872
lpettyjo merged 1 commit intoopenshift:mainfrom
opayne1:BZ2022560

Conversation

@opayne1
Copy link
Copy Markdown
Contributor

@opayne1 opayne1 commented Nov 17, 2021 •
edited
Loading

BZ link

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 17, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Nov 17, 2021 •
edited
Loading

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 334233e

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/61ba1770d01e2400071c1b73

😎 Browse the preview: https://deploy-preview-38872--osdocs.netlify.app

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 5, 2021
@openshift-ci openshift-ci Bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 7, 2021
@opayne1 opayne1 force-pushed the BZ2022560 branch 2 times, most recently from fe9aa1c to 08b1c7b Compare December 10, 2021 14:56
@opayne1
Copy link
Copy Markdown
Contributor Author

opayne1 commented Dec 14, 2021

@yunjiang29 PTAL. Thank you!

@yunjiang29
Copy link
Copy Markdown
Contributor

yunjiang29 commented Dec 15, 2021

@opayne1
c4.large and c4.xlarge should not be in the list, the minimum requirements for worker node is 2 vCPU and 8 GB memory.

@openshift-ci openshift-ci Bot 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 Dec 15, 2021
@opayne1
Copy link
Copy Markdown
Contributor Author

opayne1 commented Dec 15, 2021

@yunjiang29 Thank you for clarifying I think I was a little confused there. I have updated.

@yunjiang29
Copy link
Copy Markdown
Contributor

yunjiang29 commented Dec 16, 2021

@opayne1 LGTM, thanks for the updates.

@lpettyjo lpettyjo self-requested a review December 16, 2021 15:49
@lpettyjo lpettyjo added this to the Next Release milestone Dec 16, 2021
lpettyjo
lpettyjo reviewed Dec 16, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@lpettyjo lpettyjo left a comment

Choose a reason for hiding this comment

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

LGTM

@lpettyjo lpettyjo 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 Dec 16, 2021
@lpettyjo lpettyjo merged commit c6528fc into openshift:main Dec 16, 2021
@lpettyjo
Copy link
Copy Markdown
Contributor

lpettyjo commented Dec 16, 2021

/cherrypick enterprise-4.10

@lpettyjo
Copy link
Copy Markdown
Contributor

lpettyjo commented Dec 16, 2021

/cherrypick enterprise-4.9

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 16, 2021
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Dec 16, 2021

@lpettyjo: new pull request created: #39957

Details

In response to this:

/cherrypick enterprise-4.10

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.

@lpettyjo
Copy link
Copy Markdown
Contributor

lpettyjo commented Dec 16, 2021

/cherrypick enterprise-4.8

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 16, 2021
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Dec 16, 2021

@lpettyjo: new pull request created: #39958

Details

In response to this:

/cherrypick enterprise-4.9

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.

@lpettyjo
Copy link
Copy Markdown
Contributor

lpettyjo commented Dec 16, 2021

/cherrypick enterprise-4.7

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 16, 2021
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Dec 16, 2021

@lpettyjo: new pull request created: #39959

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.

@lpettyjo
Copy link
Copy Markdown
Contributor

lpettyjo commented Dec 16, 2021

/cherrypick enterprise-4.6

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 16, 2021
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Dec 16, 2021

@lpettyjo: new pull request created: #39960

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Dec 16, 2021

@lpettyjo: #38872 failed to apply on top of branch "enterprise-4.6":

Applying: BZ2022560: Adds m6i AWS EC2 instance
Using index info to reconstruct a base tree...
A	modules/installation-supported-aws-machine-types.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/installation-supported-aws-machine-types.adoc deleted in HEAD and modified in BZ2022560: Adds m6i AWS EC2 instance. Version BZ2022560: Adds m6i AWS EC2 instance of modules/installation-supported-aws-machine-types.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 BZ2022560: Adds m6i AWS EC2 instance
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.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.

This was referenced Dec 16, 2021
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lpettyjo lpettyjo lpettyjo left review comments

Assignees

No one assigned

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 branch/enterprise-4.9 branch/enterprise-4.10 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.

4 participants

@opayne1 @yunjiang29 @lpettyjo @openshift-cherrypick-robot