diff --git a/app/assets/css/bootstrap-override.css b/app/assets/css/bootstrap-override.css index 0ed5d556f..25121d7bf 100644 --- a/app/assets/css/bootstrap-override.css +++ b/app/assets/css/bootstrap-override.css @@ -22,6 +22,10 @@ justify-content: center; } +.justify-left { + justify-content: left; +} + .blue { background: var(--bg-dashboard-item) !important; } diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html index 70944239c..7cf6afa8d 100644 --- a/app/kubernetes/views/configure/configure.html +++ b/app/kubernetes/views/configure/configure.html @@ -25,36 +25,36 @@
Networking
- - Enabling the load balancer feature will allow users to expose application they deploy over an external IP address assigned by cloud provider. -

- +

+

Enabling the load balancer feature will allow users to expose application they deploy over an external IP address assigned by cloud provider.

+

+ Ensure that your cloud provider allows you to create load balancers if you want to use this feature. Might incur costs.

- +
- -
- - Configuring ingress controllers will allow users to expose application they deploy over a HTTP route.
-

- +

+

Configuring ingress controllers will allow users to expose application they deploy over a HTTP route.

+

+ Ingress classes must be manually specified for each controller you want to use in the cluster. Make sure that each controller is running inside your cluster.

- +
- - configure ingress controller + + configure ingress controller
@@ -90,15 +90,15 @@
-
@@ -113,26 +113,30 @@ >
-

Ingress class name is required.

-

This field must consist of lower case alphanumeric characters or '-', start with an - alphabetic character, and end with an alphanumeric character (e.g. 'my-name', or 'abc-123').

Ingress class name is required.

+

This field must consist of lower case alphanumeric characters or '-', start + with an alphabetic character, and end with an alphanumeric character (e.g. 'my-name', or 'abc-123').

-

- This ingress class is already defined. +

+ This ingress class is already defined.

-
+
-

Ingress class type is required.

+

Ingress class type is required.

@@ -150,7 +154,7 @@
-
Change Window Setting
+
Change Window Settings
@@ -161,11 +165,16 @@ feature-id="ctrl.limitedFeatureAutoWindow" tooltip="'Specify a timeframe during which automatic updates can occur in this environment.'" on-change="(ctrl.onToggleAutoUpdate)" + label-class="'col-sm-3 col-lg-2 px-0 !m-0'" + switch-class="'col-sm-8'" >
+ + +
Security
@@ -173,29 +182,32 @@ By default, all the users have access to the default namespace. Enable this option to set accesses on the default namespace.
+
- -
+
Resources and Metrics
- - By ENABLING resource over-commit, you are able to assign more resources to namespaces than is physically available in the cluster. This may lead to unexpected - deployment failures if there is insufficient resource to service demand. -

- +

+

+ By ENABLING resource over-commit, you are able to assign more resources to namespaces than is physically available in the cluster. This may lead to unexpected + deployment failures if there is insufficient resource to service demand. +

+

+ By DISABLING resource over-commit (highly recommended), you are only able to assign resources to namespaces that are less (in aggregate) than the cluster total minus any system resource reservation.

- -
-
+
+
- - Enabling this feature will allow users to use specific features like autoscaling and to see container and node resource usage. -

- +

+

Enabling this feature will allow users to use specific features like autoscaling and to see container and node resource usage.

+

+ Ensure that metrics server or prometheus is running inside your cluster.

- +
- -
@@ -230,26 +245,24 @@
- Successfully reached metrics API + Successfully reached metrics API
- Unable to reach metrics API, make sure metrics server is properly deployed inside - that cluster. + Unable to reach metrics API, make sure metrics server is properly deployed inside that cluster.
Available storage options
-
- +
+ Unable to detect any storage class available to persist data. Users won't be able to persist application data inside this cluster.
@@ -278,9 +291,9 @@ -
-
- - + + Shared access policy configuration required
diff --git a/app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx b/app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx index 1518453e6..569d681b6 100644 --- a/app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx +++ b/app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx @@ -101,7 +101,7 @@ export function EnvironmentItem({ environment, onClick, groupName }: Props) { {humanize(environment.Snapshots[0].TotalMemory)} - {environment.Gpus.length} + {environment.Gpus?.length} )} - diff --git a/app/portainer/react/components/switch-field.ts b/app/portainer/react/components/switch-field.ts index 288d71e09..3c8a0ea0f 100644 --- a/app/portainer/react/components/switch-field.ts +++ b/app/portainer/react/components/switch-field.ts @@ -13,4 +13,5 @@ export const switchField = r2a(SwitchField, [ 'onChange', 'featureId', 'switchValues', + 'switchClass', ]); diff --git a/app/react/components/form-components/SwitchField/SwitchField.tsx b/app/react/components/form-components/SwitchField/SwitchField.tsx index 2c8431d28..1072eef98 100644 --- a/app/react/components/form-components/SwitchField/SwitchField.tsx +++ b/app/react/components/form-components/SwitchField/SwitchField.tsx @@ -15,6 +15,7 @@ export interface Props { name?: string; tooltip?: string; labelClass?: string; + switchClass?: string; dataCy?: string; disabled?: boolean; featureId?: FeatureId; @@ -35,6 +36,7 @@ export function SwitchField({ onChange, featureId, switchValues, + switchClass, }: Props) { const toggleName = name ? `toggle_${name}` : ''; @@ -51,7 +53,7 @@ export function SwitchField({ {tooltip && }