Skip to content

MachinePool: hack name of vSphere default worker MachineSet#2057

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
2uasimojo:HIVE-2254/vsphere-mset-suffix
Jul 24, 2023
Merged

MachinePool: hack name of vSphere default worker MachineSet#2057
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
2uasimojo:HIVE-2254/vsphere-mset-suffix

Conversation

@2uasimojo
Copy link
Copy Markdown
Member

@2uasimojo 2uasimojo commented Jul 3, 2023

With recent installer changes to accommodate zones in vSphere, the name of the default worker pool in OCP 4.13+ is now suffixed with a -0 even when only one zone is in play. Hive's day 2 MachinePool logic needs to be able to generate the correct MachineSet name when talking to a 4.13+ cluster -- but also when talking to a 4.12- cluster. This commit adds in a special case to discover and account for this difference where it exists.

HIVE-2254

@openshift-ci 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 Jul 3, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 3, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 3, 2023
@2uasimojo 2uasimojo mentioned this pull request Jul 18, 2023
@2uasimojo
Copy link
Copy Markdown
Member Author

/test all

@2uasimojo 2uasimojo force-pushed the HIVE-2254/vsphere-mset-suffix branch from 29b22f3 to e7cca8d Compare July 21, 2023 22:35
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 21, 2023

Codecov Report

Merging #2057 (30afd4b) into master (2122078) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2057   +/-   ##
=======================================
  Coverage   57.38%   57.39%           
=======================================
  Files         186      186           
  Lines       25697    25702    +5     
=======================================
+ Hits        14747    14752    +5     
  Misses       9710     9710           
  Partials     1240     1240           
Files Changed Coverage Δ
...g/controller/machinepool/machinepool_controller.go 50.06% <100.00%> (+0.34%) ⬆️

@2uasimojo 2uasimojo marked this pull request as ready for review July 21, 2023 22:36
@openshift-ci 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 Jul 21, 2023
@openshift-ci openshift-ci Bot requested review from abutcher and dlom July 21, 2023 22:36
@2uasimojo 2uasimojo force-pushed the HIVE-2254/vsphere-mset-suffix branch from e7cca8d to 6fd31c9 Compare July 21, 2023 22:52
@2uasimojo
Copy link
Copy Markdown
Member Author

/assign @abutcher
/cc @jcpowermac @rvanderp3 @lleshchi

@2uasimojo
Copy link
Copy Markdown
Member Author

NTR: I tested this against 4.12 and 4.13 spokes, with the default worker pool as well as an additional one, with this code against hive master (currently vendoring 4.12 installer code) and on top of #2052 (vendoring recent master installer code).

Copy link
Copy Markdown
Member

@abutcher abutcher left a comment

Choose a reason for hiding this comment

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

One nit on comment, looks good to me

Comment thread pkg/controller/machinepool/machinepool_controller.go Outdated
With recent installer changes to accommodate zones in vSphere, the name
of the default worker pool in OCP 4.13+ is now suffixed with a `-0` even
when only one zone is in play. Hive's day 2 MachinePool logic needs to
be able to generate the correct MachineSet name when talking to a 4.13+
cluster -- but also when talking to a 4.12- cluster. This commit adds in
a special case to discover and account for this difference where it
exists.

HIVE-2254
@2uasimojo 2uasimojo force-pushed the HIVE-2254/vsphere-mset-suffix branch from 6fd31c9 to 30afd4b Compare July 24, 2023 19:34
@abutcher
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 24, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 2uasimojo, abutcher

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2023
@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 2122078 and 2 for PR HEAD 30afd4b in total

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 24, 2023

@2uasimojo: all tests passed!

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-merge-robot openshift-merge-robot merged commit 6adf9c0 into openshift:master Jul 24, 2023
@2uasimojo 2uasimojo deleted the HIVE-2254/vsphere-mset-suffix branch July 24, 2023 22:34
@2uasimojo
Copy link
Copy Markdown
Member Author

/cherry-pick mce-2.3

@openshift-cherrypick-robot
Copy link
Copy Markdown

@2uasimojo: new pull request created: #2067

Details

In response to this:

/cherry-pick mce-2.3

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

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants