remove 'Volume type' from BlockPool create/update form

[SanjalKatiyar]

https://bugzilla.redhat.com/show_bug.cgi?id=2239622

[SanjalKatiyar]

/cherry-pick release-4.14

[openshift-cherrypick-robot]

@SanjalKatiyar: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

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.

[SanjalKatiyar]

/cherry-pick release-4.14-compatibility

[openshift-cherrypick-robot]

@SanjalKatiyar: once the present PR merges, I will cherry-pick it on top of release-4.14-compatibility in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14-compatibility

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]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: GowthamShanmugam, SanjalKatiyar

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:

• OWNERS [SanjalKatiyar]

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

[openshift-cherrypick-robot]

@SanjalKatiyar: new pull request created: #1054

In response to this:

/cherry-pick release-4.14-compatibility

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-cherrypick-robot]

@SanjalKatiyar: new pull request created: #1055

In response to this:

/cherry-pick release-4.14

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.

[SanjalKatiyar]

/cherry-pick release-4.13-compatibility

[SanjalKatiyar]

/cherry-pick release-4.13

[SanjalKatiyar]

/cherry-pick release-4.12-compatibility

[SanjalKatiyar]

/cherry-pick release-4.12

[openshift-cherrypick-robot]

@SanjalKatiyar: #1053 failed to apply on top of branch "release-4.13-compatibility":

Applying: remove 'Volume type' from BlockPool create/update form
Using index info to reconstruct a base tree...
M	cypress/views/block-pool.ts
M	locales/en/plugin__odf-console.json
M	packages/ocs/block-pool/body.tsx
Falling back to patching base and 3-way merge...
Auto-merging packages/ocs/block-pool/body.tsx
Auto-merging locales/en/plugin__odf-console.json
CONFLICT (content): Merge conflict in locales/en/plugin__odf-console.json
Auto-merging cypress/views/block-pool.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 remove 'Volume type' from BlockPool create/update form
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-compatibility

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-cherrypick-robot]

@SanjalKatiyar: #1053 failed to apply on top of branch "release-4.13":

Applying: remove 'Volume type' from BlockPool create/update form
Using index info to reconstruct a base tree...
M	cypress/views/block-pool.ts
M	locales/en/plugin__odf-console.json
M	packages/ocs/block-pool/body.tsx
Falling back to patching base and 3-way merge...
Auto-merging packages/ocs/block-pool/body.tsx
Auto-merging locales/en/plugin__odf-console.json
CONFLICT (content): Merge conflict in locales/en/plugin__odf-console.json
Auto-merging cypress/views/block-pool.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 remove 'Volume type' from BlockPool create/update form
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.

[openshift-cherrypick-robot]

@SanjalKatiyar: #1053 failed to apply on top of branch "release-4.12-compatibility":

Applying: remove 'Volume type' from BlockPool create/update form
Using index info to reconstruct a base tree...
M	cypress/views/block-pool.ts
M	locales/en/plugin__odf-console.json
M	packages/ocs/block-pool/body.tsx
Falling back to patching base and 3-way merge...
Auto-merging packages/ocs/block-pool/body.tsx
CONFLICT (content): Merge conflict in packages/ocs/block-pool/body.tsx
Auto-merging locales/en/plugin__odf-console.json
CONFLICT (content): Merge conflict in locales/en/plugin__odf-console.json
Auto-merging cypress/views/block-pool.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 remove 'Volume type' from BlockPool create/update form
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.12-compatibility

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-cherrypick-robot]

@SanjalKatiyar: #1053 failed to apply on top of branch "release-4.12":

Applying: remove 'Volume type' from BlockPool create/update form
Using index info to reconstruct a base tree...
M	cypress/views/block-pool.ts
M	locales/en/plugin__odf-console.json
M	packages/ocs/block-pool/body.tsx
Falling back to patching base and 3-way merge...
Auto-merging packages/ocs/block-pool/body.tsx
CONFLICT (content): Merge conflict in packages/ocs/block-pool/body.tsx
Auto-merging locales/en/plugin__odf-console.json
CONFLICT (content): Merge conflict in locales/en/plugin__odf-console.json
Auto-merging cypress/views/block-pool.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 remove 'Volume type' from BlockPool create/update form
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.12

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.