github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(kubernetes): cluster setup screen text on own line EE-7112 (#11905)

pull/11580/head
Dakota Walsh 2024-06-12 08:43:17 +12:00 committed by GitHub
parent dd372ee122
commit 7549b6cf3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 94 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
app/react/kubernetes/cluster/ConfigureView/ConfigureForm/ConfigureForm.tsx
View File

@ -149,15 +149,23 @@ function InnerForm({
<Form className="form-horizontal"> <Form className="form-horizontal">
<div className="flex flex-col"> <div className="flex flex-col">
<FormSection title="Networking - Services"> <FormSection title="Networking - Services">
<TextTip color="blue" className="mb-2"> <div className="form-group">
<div className="col-sm-12">
<TextTip color="blue" inline={false}>
Enabling the load balancer feature will allow users to expose Enabling the load balancer feature will allow users to expose
applications they deploy over an external IP address assigned by the applications they deploy over an external IP address assigned by
cloud provider. the cloud provider.
</TextTip> </TextTip>
<TextTip color="orange" className="mb-4"> </div>
If you want to use this feature, ensure your cloud provider allows </div>
you to create load balancers. This may incur costs. <div className="form-group">
<div className="col-sm-12">
<TextTip color="orange" inline={false}>
If you want to use this feature, ensure your cloud provider
allows you to create load balancers. This may incur costs.
</TextTip> </TextTip>
</div>
</div>
<div className="form-group"> <div className="form-group">
<div className="col-sm-12"> <div className="col-sm-12">
<SwitchField <SwitchField
@ -239,11 +247,15 @@ function InnerForm({
/> />
</div> </div>
</div> </div>
<TextTip color="blue" className="mb-5"> <div className="form-group">
<div className="col-sm-12">
<TextTip color="blue" inline={false}>
You may set up ingress defaults (hostnames and annotations) via You may set up ingress defaults (hostnames and annotations) via
Create/Edit ingress. Users may then select them via the hostname Create/Edit ingress. Users may then select them via the hostname
dropdown in Create/Edit application. dropdown in Create/Edit application.
</TextTip> </TextTip>
</div>
</div>
</FormSection> </FormSection>
<FormSection title="Change Window Settings"> <FormSection title="Change Window Settings">
<div className="form-group"> <div className="form-group">
@ -263,12 +275,17 @@ function InnerForm({
</FormSection> </FormSection>
<FormSection title="Security"> <FormSection title="Security">
{!isRBACEnabled && isRBACEnabledQuery.isSuccess && <RBACAlert />} {!isRBACEnabled && isRBACEnabledQuery.isSuccess && <RBACAlert />}
<TextTip color="blue"> <div className="form-group">
<div className="col-sm-12">
<TextTip color="blue" inline={false}>
<p> <p>
By default, all the users have access to the default namespace. By default, all the users have access to the default
Enable this option to set accesses on the default namespace. namespace. Enable this option to set accesses on the default
namespace.
</p> </p>
</TextTip> </TextTip>
</div>
</div>
<div className="form-group"> <div className="form-group">
<div className="col-sm-12"> <div className="col-sm-12">
<SwitchField <SwitchField
@ -305,22 +322,30 @@ function InnerForm({
header="Allow resource over-commit - UI-only change in 2.20" header="Allow resource over-commit - UI-only change in 2.20"
content="Resource over-commit has always been ENABLED in Portainer CE. However, the toggle was incorrectly shown as OFF. This has now been corrected but please note that no functionality has been removed." content="Resource over-commit has always been ENABLED in Portainer CE. However, the toggle was incorrectly shown as OFF. This has now been corrected but please note that no functionality has been removed."
/> />
<TextTip color="blue"> <div className="form-group">
<div className="col-sm-12">
<TextTip color="blue" inline={false}>
<p> <p>
By DISABLING resource over-commit (highly recommended), you can By DISABLING resource over-commit (highly recommended), you
ONLY assign namespaces CPU and memory resources that are less (in can ONLY assign namespaces CPU and memory resources that are
aggregate) than the cluster total minus any system resource less (in aggregate) than the cluster total minus any system
reservation. resource reservation.
</p> </p>
</TextTip> </TextTip>
<TextTip color="orange"> </div>
</div>
<div className="form-group">
<div className="col-sm-12">
<TextTip color="orange" inline={false}>
<p> <p>
By ENABLING resource over-commit, you can assign namespaces more By ENABLING resource over-commit, you can assign namespaces
resources than are physically available in the cluster. This may more resources than are physically available in the cluster.
lead to unexpected deployment failures if there are insufficient This may lead to unexpected deployment failures if there are
resources to service demand. insufficient resources to service demand.
</p> </p>
</TextTip> </TextTip>
</div>
</div>
<div className="form-group"> <div className="form-group">
<div className="col-sm-12"> <div className="col-sm-12">
<SwitchField <SwitchField
@ -348,20 +373,27 @@ function InnerForm({
</FormSection> </FormSection>
<FormSection title="Available storage options"> <FormSection title="Available storage options">
{initialValues.storageClasses.length === 0 && ( {initialValues.storageClasses.length === 0 && (
<TextTip color="orange" className="mb-4"> <div className="form-group">
<div className="col-sm-12">
<TextTip color="orange" inline={false}>
Unable to detect any storage class available to persist data. Unable to detect any storage class available to persist data.
Users won&apos;t be able to persist application data inside this Users won&apos;t be able to persist application data inside
cluster. this cluster.
</TextTip> </TextTip>
</div>
</div>
)} )}
{initialValues.storageClasses.length > 0 && ( {initialValues.storageClasses.length > 0 && (
<> <>
<TextTip color="blue"> <div className="form-group">
<div className="col-sm-12">
<TextTip color="blue" inline={false}>
<p> <p>
Select which storage options will be available for use when Select which storage options will be available for use
deploying applications. Have a look at your storage driver when deploying applications. Have a look at your storage
documentation to figure out which access policy to configure driver documentation to figure out which access policy to
and if the volume expansion capability is supported. configure and if the volume expansion capability is
supported.
</p> </p>
<p> <p>
You can find more information about access modes{' '} You can find more information about access modes{' '}
@ -375,6 +407,8 @@ function InnerForm({
. .
</p> </p>
</TextTip> </TextTip>
</div>
</div>
<StorageClassDatatable <StorageClassDatatable
storageClassValues={values.storageClasses} storageClassValues={values.storageClasses}
/> />