Skip to content

Add MachineSet infra and server group content #25837

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
maxwelldb merged 4 commits into from
Oct 14, 2020
Merged

Add MachineSet infra and server group content #25837

maxwelldb merged 4 commits into from
Oct 14, 2020
+5 −0

Conversation

@maxwelldb
Copy link
Contributor

@maxwelldb maxwelldb commented Sep 28, 2020

  • Add OSP-specific MachineSet example to infrastructure docs assembly
  • Add server group property to sample YAML
  • Add server group property guidance to sample callouts

Context:

@pierreprinetti Does this look copacetic to you?

@maxwelldb maxwelldb self-assigned this Sep 28, 2020
@openshift-ci-robot openshift-ci-robot added 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 Sep 28, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 28, 2020
@openshift-docs-preview-bot
Copy link

openshift-docs-preview-bot commented Sep 28, 2020

The preview will be available shortly at:

@maxwelldb
Copy link
Contributor Author

maxwelldb commented Sep 28, 2020

https://aa-workers-osdocs1364--ocpdocs.netlify.app/openshift-enterprise/latest/machine_management/creating-infrastructure-machinesets.html#machineset-yaml-osp_creating-infrastructure-machinesets

pierreprinetti
pierreprinetti reviewed Sep 29, 2020
View reviewed changes
modules/machineset-yaml-osp.adoc Outdated
----
<2> Specify the node label to add.
<3> Specify the infrastructure ID and node label.
<4> Enter the value that is returned when link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html/command_line_interface_reference/server#server_group_create[creating a server group]. The server group must have `anti-affinity` or `soft-anti-affinity` policies.
Copy link
Member

@pierreprinetti pierreprinetti Sep 29, 2020

Choose a reason for hiding this comment

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

Actually, while I can't imagine a reason for setting affinity or soft-affinity, any policy (or none) is fine as far as OpenShift is concerned.

Copy link
Member

@pierreprinetti pierreprinetti Sep 29, 2020

Choose a reason for hiding this comment

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

I'd go like:
"Can be used to set an anti-affinity policy for the MachineSet".

@maxwelldb
Copy link
Contributor Author

maxwelldb commented Sep 29, 2020

@pierreprinetti How about 83aef78, then, if any policy works?

Would it make sense to say that we recommend anti-affinity or soft-anti-affinity policies for most deployments, or is that too prescriptive?

@pierreprinetti
Copy link
Member

pierreprinetti commented Sep 29, 2020

or is that too prescriptive?

No Sir, that would be copacetic.

@maxwelldb
Copy link
Contributor Author

maxwelldb commented Sep 29, 2020

@pierreprinetti TY. Added recommendation in 8838967.

pierreprinetti
pierreprinetti approved these changes Sep 30, 2020
View reviewed changes
Copy link
Member

@pierreprinetti pierreprinetti left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@maxwelldb
Copy link
Contributor Author

maxwelldb commented Sep 30, 2020

Thanks! @pierreprinetti

@maxwelldb maxwelldb added this to the Next Release milestone Sep 30, 2020
@maxwelldb maxwelldb mentioned this pull request Sep 30, 2020
Closed
@maxwelldb maxwelldb requested a review from gpei September 30, 2020 23:10
@maxwelldb maxwelldb requested review from gpei and morenod and removed request for gpei October 8, 2020 22:50
@sunzhaohua2
Copy link

sunzhaohua2 commented Oct 14, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 14, 2020
kalexand-rh
kalexand-rh reviewed Oct 14, 2020
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.

LGTM

@maxwelldb
Copy link
Contributor Author

maxwelldb commented Oct 14, 2020

Thanks!

@maxwelldb maxwelldb merged commit 774217f into openshift:master Oct 14, 2020
@maxwelldb
Copy link
Contributor Author

maxwelldb commented Oct 14, 2020 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.5

@maxwelldb
Copy link
Contributor Author

maxwelldb commented Oct 14, 2020 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 14, 2020 •
edited by openshift-ci-robot
Loading

@maxwelldb: #25837 failed to apply on top of branch "enterprise-4.6":

Applying: Add MachineSet infra and server group content
Using index info to reconstruct a base tree...
M	machine_management/creating-infrastructure-machinesets.adoc
M	modules/machineset-yaml-osp.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/machineset-yaml-osp.adoc
Auto-merging machine_management/creating-infrastructure-machinesets.adoc
CONFLICT (content): Merge conflict in machine_management/creating-infrastructure-machinesets.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 Add MachineSet infra and server group content
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:

/cherry-pick 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 openshift-cherrypick-robot mentioned this pull request Oct 14, 2020
Closed
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 14, 2020 •
edited by openshift-ci-robot
Loading

@maxwelldb: new pull request created: #26463

Details

In response to this:

/cherry-pick 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.

maxwelldb added a commit to maxwelldb/openshift-docs that referenced this pull request Oct 14, 2020
@maxwelldb
Add MachineSet infra and server group content (openshift#25837)
8bb9339 
* Add MachineSet infra and server group content

* Feedback tweak

* Add recommended policies
This was referenced Oct 14, 2020
Merged
Merged
maxwelldb added a commit that referenced this pull request Oct 14, 2020
@maxwelldb
Add MachineSet infra and server group content (#25837) (#26467)
a7487e1
@maxwelldb maxwelldb deleted the aa-workers-osdocs1364 branch October 14, 2020 19:52
@yuvalk yuvalk mentioned this pull request Mar 18, 2021
Closed
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

@morenod morenod Awaiting requested review from morenod

@gpei gpei Awaiting requested review from gpei

+1 more reviewer

@pierreprinetti pierreprinetti pierreprinetti approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@sunzhaohua2 sunzhaohua2

@maxwelldb maxwelldb

Labels

branch/enterprise-4.5 branch/enterprise-4.6 lgtm Indicates that a PR is ready to be merged. 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.

7 participants

@maxwelldb @openshift-docs-preview-bot @pierreprinetti @sunzhaohua2 @openshift-cherrypick-robot @kalexand-rh @openshift-ci-robot