mirror of
https://github.com/portainer/portainer.git
synced 2025-07-21 22:39:41 +02:00
* feat(k8s/endpoint): expose ingress controllers on endpoints * feat(k8s/applications): add ability to expose applications over ingress - missing RP and app edits * feat(k8s/application): add validation for ingress routes * feat(k8s/resource-pools): edit available ingress classes * fix(k8s/ingress): var name refactor was partially applied * feat(kubernetes): double validation on RP edit * feat(k8s/application): app edit ingress update + formvalidation + UI rework * feat(k8s/ingress): dictionary for default annotations on ingress creation * fix(k8s/application): temporary fix + TODO dev notice * feat(k8s/application): select default ingress of selected resource pool * feat(k8s/ingress): revert ingressClassName removal * feat(k8s/ingress): admins can now add an host to ingress in a resource pool * feat(k8s/resource-pool): list applications using RP ingresses * feat(k8s/configure): minor UI update * feat(k8s/configure): minor UI update * feat(k8s/configure): minor UI update * feat(k8s/configure): minor UI update * feat(k8s/configure): minor UI update * fix(k8s/ingresses): remove host if undefined * feat(k8s/resource-pool): remove the activate ingresses switch * fix(k8s/resource-pool): edditing an ingress host was deleting all the routes of the ingress * feat(k8s/application): prevent app deploy if no ports to publish and publishing type not internal * feat(k8s/ingress): minor UI update * fix(k8s/ingress): allow routes without prepending / * feat(k8s/application): add form validation on ingress route Co-authored-by: Anthony Lapenna <lapenna.anthony@gmail.com>
122 lines
4.1 KiB
JavaScript
122 lines
4.1 KiB
JavaScript
import * as _ from 'lodash-es';
|
|
import { KubernetesResourceQuota } from 'Kubernetes/models/resource-quota/models';
|
|
|
|
import angular from 'angular';
|
|
import KubernetesResourcePoolConverter from 'Kubernetes/converters/resourcePool';
|
|
import KubernetesResourceQuotaHelper from 'Kubernetes/helpers/resourceQuotaHelper';
|
|
import { KubernetesNamespace } from 'Kubernetes/models/namespace/models';
|
|
import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
|
|
|
|
class KubernetesResourcePoolService {
|
|
/* @ngInject */
|
|
constructor($async, KubernetesNamespaceService, KubernetesResourceQuotaService, KubernetesIngressService) {
|
|
this.$async = $async;
|
|
this.KubernetesNamespaceService = KubernetesNamespaceService;
|
|
this.KubernetesResourceQuotaService = KubernetesResourceQuotaService;
|
|
this.KubernetesIngressService = KubernetesIngressService;
|
|
|
|
this.getAsync = this.getAsync.bind(this);
|
|
this.getAllAsync = this.getAllAsync.bind(this);
|
|
this.createAsync = this.createAsync.bind(this);
|
|
this.deleteAsync = this.deleteAsync.bind(this);
|
|
}
|
|
|
|
/**
|
|
* GET
|
|
*/
|
|
async getAsync(name) {
|
|
try {
|
|
const namespace = await this.KubernetesNamespaceService.get(name);
|
|
const [quotaAttempt] = await Promise.allSettled([this.KubernetesResourceQuotaService.get(name, KubernetesResourceQuotaHelper.generateResourceQuotaName(name))]);
|
|
const pool = KubernetesResourcePoolConverter.apiToResourcePool(namespace);
|
|
if (quotaAttempt.status === 'fulfilled') {
|
|
pool.Quota = quotaAttempt.value;
|
|
pool.Yaml += '---\n' + quotaAttempt.value.Yaml;
|
|
}
|
|
return pool;
|
|
} catch (err) {
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
async getAllAsync() {
|
|
try {
|
|
const namespaces = await this.KubernetesNamespaceService.get();
|
|
const pools = await Promise.all(
|
|
_.map(namespaces, async (namespace) => {
|
|
const name = namespace.Name;
|
|
const [quotaAttempt] = await Promise.allSettled([this.KubernetesResourceQuotaService.get(name, KubernetesResourceQuotaHelper.generateResourceQuotaName(name))]);
|
|
const pool = KubernetesResourcePoolConverter.apiToResourcePool(namespace);
|
|
if (quotaAttempt.status === 'fulfilled') {
|
|
pool.Quota = quotaAttempt.value;
|
|
pool.Yaml += '---\n' + quotaAttempt.value.Yaml;
|
|
}
|
|
return pool;
|
|
})
|
|
);
|
|
return pools;
|
|
} catch (err) {
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
get(name) {
|
|
if (name) {
|
|
return this.$async(this.getAsync, name);
|
|
}
|
|
return this.$async(this.getAllAsync);
|
|
}
|
|
|
|
/**
|
|
* CREATE
|
|
* @param {KubernetesResourcePoolFormValues} formValues
|
|
*/
|
|
async createAsync(formValues) {
|
|
try {
|
|
const namespace = new KubernetesNamespace();
|
|
namespace.Name = formValues.Name;
|
|
namespace.ResourcePoolName = formValues.Name;
|
|
namespace.ResourcePoolOwner = formValues.Owner;
|
|
await this.KubernetesNamespaceService.create(namespace);
|
|
if (formValues.HasQuota) {
|
|
const quota = new KubernetesResourceQuota(formValues.Name);
|
|
quota.CpuLimit = formValues.CpuLimit;
|
|
quota.MemoryLimit = KubernetesResourceReservationHelper.bytesValue(formValues.MemoryLimit);
|
|
quota.ResourcePoolName = formValues.Name;
|
|
quota.ResourcePoolOwner = formValues.Owner;
|
|
await this.KubernetesResourceQuotaService.create(quota);
|
|
}
|
|
const ingressPromises = _.map(formValues.IngressClasses, (c) => {
|
|
if (c.Selected) {
|
|
c.Namespace = namespace.Name;
|
|
return this.KubernetesIngressService.create(c);
|
|
}
|
|
});
|
|
await Promise.all(ingressPromises);
|
|
} catch (err) {
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
create(formValues) {
|
|
return this.$async(this.createAsync, formValues);
|
|
}
|
|
|
|
/**
|
|
* DELETE
|
|
*/
|
|
async deleteAsync(pool) {
|
|
try {
|
|
await this.KubernetesNamespaceService.delete(pool.Namespace);
|
|
} catch (err) {
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
delete(pool) {
|
|
return this.$async(this.deleteAsync, pool);
|
|
}
|
|
}
|
|
|
|
export default KubernetesResourcePoolService;
|
|
angular.module('portainer.kubernetes').service('KubernetesResourcePoolService', KubernetesResourcePoolService);
|