Skip to content

[mce-2.2] MachinePool: hack name of vSphere default worker MachineSet#2068

Merged
openshift-merge-robot merged 1 commit intoopenshift:mce-2.2from
openshift-cherrypick-robot:cherry-pick-2067-to-mce-2.2
Jul 25, 2023
Merged

[mce-2.2] MachinePool: hack name of vSphere default worker MachineSet#2068
openshift-merge-robot merged 1 commit intoopenshift:mce-2.2from
openshift-cherrypick-robot:cherry-pick-2067-to-mce-2.2

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jul 25, 2023

This is an automated cherry-pick of #2067

/assign 2uasimojo

HIVE-2254

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 25, 2023

@openshift-cherrypick-robot: 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.

@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 25, 2023

Codecov Report

Merging #2068 (9c5fd79) into mce-2.2 (7f0e575) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           mce-2.2    #2068   +/-   ##
========================================
  Coverage    42.16%   42.17%           
========================================
  Files          366      366           
  Lines        34093    34098    +5     
========================================
+ Hits         14377    14382    +5     
  Misses       18492    18492           
  Partials      1224     1224           
Files Changed Coverage Δ
...g/controller/machinepool/machinepool_controller.go 48.84% <100.00%> (+0.35%) ⬆️

@2uasimojo
Copy link
Copy Markdown
Member

/lgtm

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

openshift-ci Bot commented Jul 25, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 2uasimojo, openshift-cherrypick-robot

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 25, 2023
@openshift-merge-robot openshift-merge-robot merged commit a740f5c into openshift:mce-2.2 Jul 25, 2023
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.

3 participants