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

154
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">
Enabling the load balancer feature will allow users to expose <div className="col-sm-12">
applications they deploy over an external IP address assigned by the <TextTip color="blue" inline={false}>
cloud provider. Enabling the load balancer feature will allow users to expose
</TextTip> applications they deploy over an external IP address assigned by
<TextTip color="orange" className="mb-4"> the cloud provider.
If you want to use this feature, ensure your cloud provider allows </TextTip>
you to create load balancers. This may incur costs. </div>
</TextTip> </div>
<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>
</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">
You may set up ingress defaults (hostnames and annotations) via <div className="col-sm-12">
Create/Edit ingress. Users may then select them via the hostname <TextTip color="blue" inline={false}>
dropdown in Create/Edit application. You may set up ingress defaults (hostnames and annotations) via
</TextTip> Create/Edit ingress. Users may then select them via the hostname
dropdown in Create/Edit application.
</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">
<p> <div className="col-sm-12">
By default, all the users have access to the default namespace. <TextTip color="blue" inline={false}>
Enable this option to set accesses on the default namespace. <p>
</p> By default, all the users have access to the default
</TextTip> namespace. Enable this option to set accesses on the default
namespace.
</p>
</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">
<p> <div className="col-sm-12">
By DISABLING resource over-commit (highly recommended), you can <TextTip color="blue" inline={false}>
ONLY assign namespaces CPU and memory resources that are less (in <p>
aggregate) than the cluster total minus any system resource By DISABLING resource over-commit (highly recommended), you
reservation. can ONLY assign namespaces CPU and memory resources that are
</p> less (in aggregate) than the cluster total minus any system
</TextTip> resource reservation.
<TextTip color="orange"> </p>
<p> </TextTip>
By ENABLING resource over-commit, you can assign namespaces more </div>
resources than are physically available in the cluster. This may </div>
lead to unexpected deployment failures if there are insufficient <div className="form-group">
resources to service demand. <div className="col-sm-12">
</p> <TextTip color="orange" inline={false}>
</TextTip> <p>
By ENABLING resource over-commit, you can assign namespaces
more resources than are physically available in the cluster.
This may lead to unexpected deployment failures if there are
insufficient resources to service demand.
</p>
</TextTip>
</div>
</div>
<div className="form-group"> <div className="form-group">
<div className="col-sm-12"> <div className="col-sm-12">
<SwitchField <SwitchField
@ -348,33 +373,42 @@ 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">
Unable to detect any storage class available to persist data. <div className="col-sm-12">
Users won&apos;t be able to persist application data inside this <TextTip color="orange" inline={false}>
cluster. Unable to detect any storage class available to persist data.
</TextTip> Users won&apos;t be able to persist application data inside
this cluster.
</TextTip>
</div>
</div>
)} )}
{initialValues.storageClasses.length > 0 && ( {initialValues.storageClasses.length > 0 && (
<> <>
<TextTip color="blue"> <div className="form-group">
<p> <div className="col-sm-12">
Select which storage options will be available for use when <TextTip color="blue" inline={false}>
deploying applications. Have a look at your storage driver <p>
documentation to figure out which access policy to configure Select which storage options will be available for use
and if the volume expansion capability is supported. when deploying applications. Have a look at your storage
</p> driver documentation to figure out which access policy to
<p> configure and if the volume expansion capability is
You can find more information about access modes{' '} supported.
<a </p>
href="https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes" <p>
target="_blank" You can find more information about access modes{' '}
rel="noreferrer" <a
> href="https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes"
in the official Kubernetes documentation target="_blank"
</a> rel="noreferrer"
. >
</p> in the official Kubernetes documentation
</TextTip> </a>
.
</p>
</TextTip>
</div>
</div>
<StorageClassDatatable <StorageClassDatatable
storageClassValues={values.storageClasses} storageClassValues={values.storageClasses}
/> />