8000
Skip to content

fix: the storageclass form used by select or input#361

Merged
moweiwei merged 1 commit intokubeclipper:masterfrom
lysign:master
Dec 30, 2022
Merged

fix: the storageclass form used by select or input#361
moweiwei merged 1 commit intokubeclipper:masterfrom
lysign:master

Conversation

@lysign
Copy link
Copy Markdown
Collaborator
@lysign lysign commented Dec 30, 2022

Signed-off-by: liuying liu.ying@99cloud.net

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for reviewers:

Does this PR introduced a user-facing change?

Additional documentation, usage docs, etc.:

@lysign
fix: the storageclass form used by select or input
d6a733a 
Signed-off-by: liuying <liu.ying@99cloud.net>
@kubeclipper-bot kubeclipper-bot added the kind/bug Categorizes issue or PR as related to a bug. label Dec 30, 2022
@kubeclipper-bot
Copy link
Copy Markdown
Collaborator
kubeclipper-bot commented Dec 30, 2022

@lysign: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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.

@kubeclipper-bot kubeclipper-bot added dco-signoff: yes do-not-merge/release-note-label-needed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 30, 2022
@codecov-commenter
Copy link
Copy Markdown
codecov-commenter commented Dec 30, 2022

Codecov Report

Merging #361 (d6a733a) into master (5168ff5) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #361   +/-   ##
=======================================
  Coverage   47.55%   47.55%           
=======================================
  Files           7        7           
  Lines         614      614           
  Branches      177      177           
=======================================
  Hits          292      292           
  Misses        248      248           
  Partials       74       74

@kubeclipper-bot
Copy link
Copy Markdown
Collaborator
kubeclipper-bot commented Dec 30, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lysign, moweiwei

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

@moweiwei moweiwei merged commit d91db4a into kubeclipper:master Dec 30, 2022
@kubeclipper-bot kubeclipper-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 30, 2022
moweiwei pushed a commit to moweiwei/console that referenced this pull request Jan 5, 2023
@lysign @moweiwei
fix: the storageclass form used by select or input (kubeclipper#361)
ff23eb1 
Signed-off-by: liuying <liu.ying@99cloud.net>

Signed-off-by: liuying <liu.ying@99cloud.net>
@lysign
Copy link
Copy Markdown
Collaborator Author
lysign commented Feb 27, 2023

/cherrypick release-1.3

@kubeclipper-bot
Copy link
Copy Markdown
Collaborator
kubeclipper-bot commented Feb 27, 2023

@lysign: #361 failed to apply on top of branch "release-1.3":

Applying: fix: the storageclass form used by select or input
Using index info to reconstruct a base tree...
M	src/components/FormRender/index.jsx
Falling back to patching base and 3-way merge...
Auto-merging src/components/FormRender/index.jsx
CONFLICT (content): Merge conflict in src/components/FormRender/index.jsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: the storageclass form used by select or input
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-1.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.

@kubeclipper-bot kubeclipper-bot mentioned this pull request Feb 27, 2023
Closed
@kubeclipper-bot
Copy link
Copy Markdown
Collaborator
kubeclipper-bot commented Feb 27, 2023

@lysign: new issue created for failed cherrypick: #376

Details

In response to this:

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

Reviewers

@moweiwei moweiwei moweiwei approved these changes

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes do-not-merge/release-note-label-needed kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lysign @kubeclipper-bot @codecov-commenter @moweiwei
0