Bug 2003113: Improve host role management during assets creation by andfasano · Pull Request #5205 · openshift/installer

andfasano · 2021-09-10T15:53:31Z

The current patch provides a fix for the issue BZ 2003113.
The logic for generating baremetal manifests and Terraform variables now takes into account the host role tag properly, if defined.
To remain backward compatible, if an host doesn not have any role defined (or supported value), it's considered eligible for the ControlPlane or Compute respectively, based on the configured requirements.
For that, the validation rule has been enhanced to verify that the correct number of hosts have been configured.

andfasano · 2021-09-13T09:07:08Z

/retest

hardys · 2021-09-13T10:20:54Z

/label platform/baremetal

openshift-ci · 2021-09-13T13:02:17Z

@andfasano: This pull request references Bugzilla bug 2003113, which is invalid:

expected the bug to target the "4.10.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

[WIP] Bug 2003113: Skip workers while generating TF vars

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.

andfasano · 2021-09-13T13:06:12Z

/bugzilla refresh

openshift-ci · 2021-09-13T13:06:15Z

@andfasano: This pull request references Bugzilla bug 2003113, which is invalid:

expected the bug to target the "4.10.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

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.

andfasano · 2021-09-13T13:08:45Z

/bugzilla refresh

openshift-ci · 2021-09-13T13:08:52Z

@andfasano: This pull request references Bugzilla bug 2003113, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.10.0) matches configured target release for branch (4.10.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (augol@redhat.com), skipping review request.

Details

In response to this:

/bugzilla refresh

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-ci · 2021-09-14T13:04:51Z

@andfasano: This pull request references Bugzilla bug 2003113, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.10.0) matches configured target release for branch (4.10.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (augol@redhat.com), skipping review request.

Details

In response to this:

[WIP] Bug 2003113: Skip workers while generating TF vars

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.

andfasano · 2021-09-15T07:15:17Z

/retest

openshift-bot · 2021-11-10T03:20:03Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T03:32:03Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T03:44:00Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T04:08:03Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-11-10T04:25:53Z

@andfasano: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-ovirt	`59908ee`	link	false	`/test e2e-ovirt`
ci/prow/e2e-aws-workers-rhel7	`59908ee`	link	false	`/test e2e-aws-workers-rhel7`
ci/prow/e2e-aws-workers-rhel8	`59908ee`	link	false	`/test e2e-aws-workers-rhel8`
ci/prow/okd-e2e-aws-upgrade	`59908ee`	link	false	`/test okd-e2e-aws-upgrade`
ci/prow/e2e-crc	`59908ee`	link	false	`/test e2e-crc`

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

openshift-bot · 2021-11-10T04:44:00Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T05:08:00Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T05:32:03Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T06:20:01Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T06:32:02Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T06:44:01Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T06:56:02Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T07:08:02Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T07:32:08Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T08:08:02Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T08:44:02Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T08:56:02Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-10T09:07:59Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-11-10T09:10:46Z

@andfasano: All pull requests linked via external trackers have merged:

openshift/installer#5205

Bugzilla bug 2003113 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2003113: Improve host role management during assets creation

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.

andfasano · 2021-11-18T17:21:25Z

/cherrypick 4.9

openshift-cherrypick-robot · 2021-11-18T17:22:26Z

@andfasano: cannot checkout 4.9: error checking out 4.9: exit status 1. output: error: pathspec '4.9' did not match any file(s) known to git

Details

In response to this:

/cherrypick 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.

andfasano · 2021-11-18T17:23:44Z

/cherrypick release-4.9

openshift-cherrypick-robot · 2021-11-18T17:24:23Z

@andfasano: #5205 failed to apply on top of branch "release-4.9":

Applying: baremetal: improve host role management during assets creation
Using index info to reconstruct a base tree...
M	pkg/asset/cluster/tfvars.go
M	pkg/asset/machines/baremetal/hosts.go
M	pkg/asset/machines/baremetal/hosts_test.go
M	pkg/types/baremetal/validation/platform.go
M	pkg/types/baremetal/validation/platform_test.go
M	pkg/types/validation/installconfig_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/types/validation/installconfig_test.go
Auto-merging pkg/types/baremetal/validation/platform_test.go
Auto-merging pkg/types/baremetal/validation/platform.go
Auto-merging pkg/asset/machines/baremetal/hosts_test.go
CONFLICT (content): Merge conflict in pkg/asset/machines/baremetal/hosts_test.go
Auto-merging pkg/asset/machines/baremetal/hosts.go
Auto-merging pkg/asset/cluster/tfvars.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 baremetal: improve host role management during assets creation
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 release-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.

andfasano · 2021-11-23T10:18:13Z

/cherrypick release-4.8

openshift-cherrypick-robot · 2021-11-23T10:19:23Z

@andfasano: #5205 failed to apply on top of branch "release-4.8":

Applying: baremetal: improve host role management during assets creation
Using index info to reconstruct a base tree...
M	pkg/asset/cluster/tfvars.go
M	pkg/asset/machines/baremetal/hosts.go
M	pkg/asset/machines/baremetal/hosts_test.go
M	pkg/types/baremetal/platform.go
M	pkg/types/baremetal/validation/platform.go
M	pkg/types/baremetal/validation/platform_test.go
M	pkg/types/validation/installconfig_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/types/validation/installconfig_test.go
Auto-merging pkg/types/baremetal/validation/platform_test.go
Auto-merging pkg/types/baremetal/validation/platform.go
Auto-merging pkg/types/baremetal/platform.go
Auto-merging pkg/asset/machines/baremetal/hosts_test.go
CONFLICT (content): Merge conflict in pkg/asset/machines/baremetal/hosts_test.go
Auto-merging pkg/asset/machines/baremetal/hosts.go
Auto-merging pkg/asset/cluster/tfvars.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 baremetal: improve host role management during assets creation
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 release-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-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 10, 2021

openshift-ci Bot requested review from markmc and stbenjam September 10, 2021 15:53

openshift-ci Bot added the platform/baremetal IPI bare metal hosts platform label Sep 13, 2021

andfasano changed the title ~~[WIP] Skip workers while generating TF vars~~ [WIP] BZ 2003113: Skip workers while generating TF vars Sep 13, 2021

andfasano changed the title ~~[WIP] BZ 2003113: Skip workers while generating TF vars~~ [WIP] Bug 2003113: Skip workers while generating TF vars Sep 13, 2021

openshift-ci Bot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Sep 13, 2021

openshift-ci Bot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Sep 13, 2021

openshift-ci Bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Sep 13, 2021

andfasano force-pushed the fix-baremetal-hosts-order branch 2 times, most recently from 1302c54 to 606f3f0 Compare September 14, 2021 12:57

andfasano force-pushed the fix-baremetal-hosts-order branch from a5a2030 to b503624 Compare September 14, 2021 13:25

sadasu reviewed Sep 14, 2021

View reviewed changes

Comment thread pkg/tfvars/baremetal/baremetal_test.go Outdated

sadasu reviewed Sep 14, 2021

View reviewed changes

Comment thread pkg/types/baremetal/validation/platform.go Outdated

sadasu reviewed Sep 14, 2021

View reviewed changes

Comment thread pkg/types/validation/installconfig_test.go Outdated

andfasano force-pushed the fix-baremetal-hosts-order branch from b503624 to c7c6e07 Compare September 14, 2021 16:40

andfasano force-pushed the fix-baremetal-hosts-order branch from c7c6e07 to 10706ab Compare September 15, 2021 08:11

andfasano changed the title ~~[WIP] Bug 2003113: Skip workers while generating TF vars~~ Bug 2003113: Skip workers while generating TF vars Sep 15, 2021

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 15, 2021

andfasano changed the title ~~Bug 2003113: Skip workers while generating TF vars~~ [WIP] Bug 2003113: Skip workers while generating TF vars Sep 16, 2021

openshift-merge-robot merged commit c88793c into openshift:master Nov 10, 2021

andfasano mentioned this pull request Nov 23, 2021

Bug 2025862: Improve host role management during assets creation #5408

Merged

andfasano mentioned this pull request Nov 23, 2021

Bug 2025901: Improve host role management during assets creation #5409

Merged

andfasano mentioned this pull request Jun 9, 2023

[release-4.13] OCPBUGS-14432: Check that number of replicas matches hosts #7221

Closed

bfournie mentioned this pull request Jun 27, 2023

OCPBUGS-14877: Validate that number hosts does not exceed replicas #7268

Merged

Conversation

andfasano commented Sep 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andfasano commented Sep 13, 2021

Uh oh!

hardys commented Sep 13, 2021

Uh oh!

openshift-ci Bot commented Sep 13, 2021

Uh oh!

andfasano commented Sep 13, 2021

Uh oh!

openshift-ci Bot commented Sep 13, 2021

Uh oh!

andfasano commented Sep 13, 2021

Uh oh!

openshift-ci Bot commented Sep 13, 2021

Uh oh!

openshift-ci Bot commented Sep 14, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

andfasano commented Sep 15, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-ci Bot commented Nov 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-bot commented Nov 10, 2021

Uh oh!

openshift-ci Bot commented Nov 10, 2021

Uh oh!

andfasano commented Nov 18, 2021

Uh oh!

openshift-cherrypick-robot commented Nov 18, 2021

Uh oh!

andfasano commented Nov 18, 2021

Uh oh!

openshift-cherrypick-robot commented Nov 18, 2021

Uh oh!

andfasano commented Nov 23, 2021

Uh oh!

openshift-cherrypick-robot commented Nov 23, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

andfasano commented Sep 10, 2021 •

edited

Loading

openshift-ci Bot commented Nov 10, 2021 •

edited

Loading