Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

port changes from EE (#9003)

Browse source
This commit is contained in:
Matt Hook 2023-06-02 08:35:15 +12:00 • committed by GitHub
parent 3cd0409184
commit fb2646b70c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/kubernetes/components/helm/helm-templates/helm-add-repository/helm-add-repository.html
View file

@ -11,9 +11,11 @@
<div class="actionBar">
<form class="form-horizontal" name="addUserHelmRepoForm">
<div class="form-group">
<span class="col-sm-12 text-muted small">
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
Add a Helm repository. All Helm charts in the repository will be added to the list.
<span class="col-sm-12 text-muted small inline-flex gap-1 !align-top">
<div class="icon icon-sm">
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
</div>
<div> Add a Helm repository. All Helm charts in the repository will be added to the list. </div>
</span>
</div>

37
app/kubernetes/views/configure/configure.html
View file

@ -27,13 +27,13 @@
<div class="form-group">
<div class="col-sm-12 text-muted small">
<p> Enabling the load balancer feature will allow users to expose application they deploy over an external IP address assigned by cloud provider. </p>
<p class="vertical-center mt-1">
<pr-icon icon="'alert-circle'" mode="'warning'"></pr-icon>
Ensure that your cloud provider allows you to create load balancers if you want to use this feature. Might incur costs.
</p>
<div class="!inline-flex gap-1 !align-top">
<div class="icon icon-sm"><pr-icon icon="'alert-circle'" mode="'warning'"></pr-icon></div>
<div>Ensure that your cloud provider allows you to create load balancers if you want to use this feature. Might incur costs.</div>
</div>
</div>
<div class="col-sm-12">
<div class="col-sm-12 mt-4">
<label class="control-label col-sm-5 col-lg-4 px-0 text-left"> Allow users to use external load balancer </label>
<label class="switch col-sm-8 mb-0">
<input type="checkbox" ng-model="ctrl.formValues.UseLoadBalancer" /><span class="slider round" data-cy="kubeSetup-loadBalancerToggle"></span>
@ -185,14 +185,16 @@
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.
</p>
<p class="vertical-center mt-1">
<pr-icon icon="'alert-circle'" mode="'warning'"></pr-icon>
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.
</p>
<div class="mt-1 inline-flex gap-1 !align-top">
<div class="icon icon-sm"><pr-icon icon="'alert-circle'" mode="'warning'"></pr-icon></div>
<div
>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.</div
>
</div>
</div>
<div class="col-sm-12">
<div class="col-sm-12 mt-2">
<por-switch-field
data-cy="'kubeSetup-resourceOverCommitToggle'"
label="'Allow resource over-commit'"
@ -209,11 +211,14 @@
<div class="form-group">
<div class="col-sm-12 text-muted small">
<p> Enabling this feature will allow users to use specific features like autoscaling and to see container and node resource usage. </p>
<p class="vertical-center mt-1">
<pr-icon icon="'alert-circle'" mode="'warning'"></pr-icon>
Ensure that <a href="https://kubernetes.io/docs/tasks/debug-application-cluster/resource-metrics-pipeline/#metrics-server" target="_blank">metrics server</a> or
<a href="https://github.com/kubernetes-sigs/prometheus-adapter" target="_blank">prometheus</a> is running inside your cluster.
</p>
<div class="mt-1 !inline-flex gap-1 !align-top">
<div class="icon icon-small"><pr-icon icon="'alert-circle'" mode="'warning'"></pr-icon></div>
<div
>Ensure that
<a href="https://kubernetes.io/docs/tasks/debug-application-cluster/resource-metrics-pipeline/#metrics-server" target="_blank">metrics server</a> or
<a href="https://github.com/kubernetes-sigs/prometheus-adapter" target="_blank">prometheus</a> is running inside your cluster.</div
>
</div>
</div>
</div>
<div class="form-group">