Skip to content
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.

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

MGMT-14527: Add vSphere cluster field. #12806

Merged
merged 1 commit into from May 26, 2023

Conversation

rawagner
Copy link
Contributor

@rawagner rawagner commented May 10, 2023

Fix some additional minor issues & simplify code

Screenshot from 2023-05-10 15-48-17

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 10, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented May 10, 2023

@rawagner: This pull request references MGMT-14527 which is a valid jira issue.

In response to this:

Fix some additional minor issues & simplify code

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 10, 2023
@rawagner rawagner force-pushed the vsphere_cluster branch 2 times, most recently from 5bf1717 to c130d4b Compare May 10, 2023 13:45
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented May 10, 2023

@rawagner: This pull request references MGMT-14527 which is a valid jira issue.

In response to this:

Fix some additional minor issues & simplify code

Screenshot from 2023-05-10 15-48-17

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.

Fix some additional minor issues & simplify code
@rawagner
Copy link
Contributor Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2023

@rawagner: all tests passed!

Full PR test history. Your PR dashboard.

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.

@mareklibra
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 11, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mareklibra, rawagner

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

The pull request process is described here

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

1 similar comment
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mareklibra, rawagner

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

The pull request process is described here

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

@rawagner
Copy link
Contributor Author

@opayne1 @RickJWagner @yanpzhan for the approvals.

@opayne1
Copy link
Contributor

opayne1 commented May 16, 2023

/label docs-approved

@openshift-ci openshift-ci bot added the docs-approved Signifies that Docs has signed off on this PR label May 16, 2023
@RickJWagner
Copy link

Looks good.

/label px-approved

@openshift-ci openshift-ci bot added the px-approved Signifies that Product Support has signed off on this PR label May 16, 2023
@yapei
Copy link
Contributor

yapei commented May 24, 2023

verified following

  1. vCenter cluster field value is correctly populated
  2. After updating vCenter cluster, new values can be successfully saved to failureDomains.topology.networks of infrastructure.config.openshift.io/cluster
  3. pesudo translation is done for new added vCenter cluster filed and all other fields in the form

@yapei
Copy link
Contributor

yapei commented May 24, 2023

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 24, 2023
@openshift-merge-robot openshift-merge-robot merged commit fdf4226 into openshift:master May 26, 2023
6 checks passed
@rawagner
Copy link
Contributor Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@rawagner: #12806 failed to apply on top of branch "release-4.13":

Applying: Add vSphere cluster field. Fix some additional minor issues & simplify code
Using index info to reconstruct a base tree...
M	frontend/packages/vsphere-plugin/locales/en/vsphere-plugin.json
M	frontend/packages/vsphere-plugin/src/components/VSphereConnectionForm.tsx
M	frontend/packages/vsphere-plugin/src/components/VSphereConnectionModal.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/vsphere-plugin/src/components/VSphereConnectionModal.tsx
CONFLICT (content): Merge conflict in frontend/packages/vsphere-plugin/src/components/VSphereConnectionModal.tsx
Auto-merging frontend/packages/vsphere-plugin/src/components/VSphereConnectionForm.tsx
CONFLICT (content): Merge conflict in frontend/packages/vsphere-plugin/src/components/VSphereConnectionForm.tsx
Removing frontend/packages/vsphere-plugin/src/components/InProgress.tsx
Auto-merging frontend/packages/vsphere-plugin/locales/en/vsphere-plugin.json
CONFLICT (content): Merge conflict in frontend/packages/vsphere-plugin/locales/en/vsphere-plugin.json
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 vSphere cluster field. Fix some additional minor issues & simplify code
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".

In response to this:

/cherry-pick release-4.13

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. docs-approved Signifies that Docs has signed off on this PR jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants