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
Bug 1834186: Change Input of Independent Mode to Text Area from Text Input #5241
Bug 1834186: Change Input of Independent Mode to Text Area from Text Input #5241
Conversation
004ed22
to
c045b39
Compare
frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts
Outdated
Show resolved
Hide resolved
frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts
Show resolved
Hide resolved
@bipuladh Can you please add the screenshot of the view once the json file is uploaded. Wants to see how it looks after uploading. |
frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts
Outdated
Show resolved
Hide resolved
frontend/packages/ceph-storage-plugin/src/components/independent-mode/install.tsx
Outdated
Show resolved
Hide resolved
frontend/packages/ceph-storage-plugin/src/components/independent-mode/install.tsx
Show resolved
Hide resolved
@@ -143,40 +99,15 @@ const InstallExternalCluster = withHandlePromise((props: InstallExternalClusterP | |||
.catch((e) => { | |||
// eslint-disable-next-line no-console | |||
console.error(e); | |||
// Remove secret if cluster creation was not possible | |||
handlePromise(k8sKill(SecretModel, secret)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts
Outdated
Show resolved
Hide resolved
@@ -30,6 +59,11 @@ export const checkForIndependentSupport = (csv: ClusterServiceVersionKind): bool | |||
return independent === 'true'; | |||
}; | |||
|
|||
export const getRequiredKeys = (csv: ClusterServiceVersionKind): string[] => { | |||
const keys = csv.metadata.annotations?.['external.cluster.ocs.openshift.io/keys']; | |||
return keys?.split(','); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are you expecting keys to be a string?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
similar to the feature annotation so yes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good!
@@ -30,6 +59,11 @@ export const checkForIndependentSupport = (csv: ClusterServiceVersionKind): bool | |||
return independent === 'true'; | |||
}; | |||
|
|||
export const getRequiredKeys = (csv: ClusterServiceVersionKind): string[] => { | |||
const keys = csv.metadata.annotations?.['external.cluster.ocs.openshift.io/keys']; | |||
return keys?.split(','); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good!
frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts
Outdated
Show resolved
Hide resolved
frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts
Outdated
Show resolved
Hide resolved
frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts
Outdated
Show resolved
Hide resolved
c045b39
to
0a82b98
Compare
frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts
Outdated
Show resolved
Hide resolved
You haven't added this to the independent mode request?
|
I don't see it used anywhere else. Is it documented anywhere? |
Please check the document by Sebastian. |
0a82b98
to
8d28afc
Compare
@bipuladh add bugzilla! |
4c9019e
to
3d6ef49
Compare
3d6ef49
to
7b64605
Compare
7b64605
to
21cc9f7
Compare
frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-page.tsx
Show resolved
Hide resolved
21cc9f7
to
234cbec
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT
/> | ||
</div> | ||
</div> | ||
)} | ||
{(isIndependent === false || mode === MODES.CONVERGED) && ( | ||
<CreateOCSServiceForm match={match} /> | ||
)} | ||
{mode === MODES.INDEPENDENT && <InstallExternalCluster match={match} />} | ||
{mode === MODES.INDEPENDENT && independentReqdKeys && downloadFile && ( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
downloadFile
should not be a hard requirement.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not doing this is a source of bug.
234cbec
to
21a2de2
Compare
/lgtm |
/hold needs to be in sync with red-hat-storage/ocs-operator#499 |
/bugzilla refresh |
@bipuladh: This pull request references Bugzilla bug 1834186, which is valid. 3 validation(s) were run on this bug
In response to this:
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. |
21a2de2
to
1d82c6f
Compare
/hold cancel |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: a2batic, bipuladh, cloudbehl 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 |
@bipuladh: All pull requests linked via external trackers have merged: openshift/console#5241. Bugzilla bug 1834186 has been moved to the MODIFIED state. In response to this:
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. |
Screenshots
Before File Upload:
After File Upload:
UXD
https://marvelapp.com/da7ai67/screen/65092932