mirror of
https://github.com/portainer/portainer.git
synced 2025-07-22 06:49:40 +02:00
* feat(app): rework private registries and support private registries in kubernetes [EE-30] feat(api): backport private registries backend changes (#5072) * feat(api/bolt): backport bolt changes * feat(api/exec): backport exec changes * feat(api/http): backport http/handler/dockerhub changes * feat(api/http): backport http/handler/endpoints changes * feat(api/http): backport http/handler/registries changes * feat(api/http): backport http/handler/stacks changes * feat(api/http): backport http/handler changes * feat(api/http): backport http/proxy/factory/azure changes * feat(api/http): backport http/proxy/factory/docker changes * feat(api/http): backport http/proxy/factory/utils changes * feat(api/http): backport http/proxy/factory/kubernetes changes * feat(api/http): backport http/proxy/factory changes * feat(api/http): backport http/security changes * feat(api/http): backport http changes * feat(api/internal): backport internal changes * feat(api): backport api changes * feat(api/kubernetes): backport kubernetes changes * fix(api/http): changes on backend following backport feat(app): backport private registries frontend changes (#5056) * feat(app/docker): backport docker/components changes * feat(app/docker): backport docker/helpers changes * feat(app/docker): backport docker/views/container changes * feat(app/docker): backport docker/views/images changes * feat(app/docker): backport docker/views/registries changes * feat(app/docker): backport docker/views/services changes * feat(app/docker): backport docker changes * feat(app/kubernetes): backport kubernetes/components changes * feat(app/kubernetes): backport kubernetes/converters changes * feat(app/kubernetes): backport kubernetes/models changes * feat(app/kubernetes): backport kubernetes/registries changes * feat(app/kubernetes): backport kubernetes/services changes * feat(app/kubernetes): backport kubernetes/views/applications changes * feat(app/kubernetes): backport kubernetes/views/configurations changes * feat(app/kubernetes): backport kubernetes/views/configure changes * feat(app/kubernetes): backport kubernetes/views/resource-pools changes * feat(app/kubernetes): backport kubernetes/views changes * feat(app/portainer): backport portainer/components/accessManagement changes * feat(app/portainer): backport portainer/components/datatables changes * feat(app/portainer): backport portainer/components/forms changes * feat(app/portainer): backport portainer/components/registry-details changes * feat(app/portainer): backport portainer/models changes * feat(app/portainer): backport portainer/rest changes * feat(app/portainer): backport portainer/services changes * feat(app/portainer): backport portainer/views changes * feat(app/portainer): backport portainer changes * feat(app): backport app changes * config(project): gitignore + jsconfig changes gitignore all files under api/cmd/portainer but main.go and enable Code Editor autocomplete on import ... from '@/...' fix(app): fix pull rate limit checker fix(app/registries): sidebar menus and registry accesses users filtering fix(api): add missing kube client factory fix(kube): fetch dockerhub pull limits (#5133) fix(app): pre review fixes (#5142) * fix(app/registries): remove checkbox for endpointRegistries view * fix(endpoints): allow access to default namespace * fix(docker): fetch pull limits * fix(kube/ns): show selected registries for non admin Co-authored-by: Chaim Lev-Ari <chiptus@gmail.com> chore(webpack): ignore missing sourcemaps fix(registries): fetch registry config from url feat(kube/registries): ignore not found when deleting secret feat(db): move migration to db 31 fix(registries): fix bugs in PR EE-869 (#5169) * fix(registries): hide role * fix(endpoints): set empty access policy to edge endpoint * fix(registry): remove double arguments * fix(admin): ignore warning * feat(kube/configurations): tag registry secrets (#5157) * feat(kube/configurations): tag registry secrets * feat(kube/secrets): show registry secrets for admins * fix(registries): move dockerhub to beginning * refactor(registries): use endpoint scoped registries feat(registries): filter by namespace if supplied feat(access-managment): filter users for registry (#5191) * refactor(access-manage): move users selector to component * feat(access-managment): filter users for registry refactor(registries): sync code with CE (#5200) * refactor(registry): add inspect handler under endpoints * refactor(endpoint): sync endpoint_registries_list * refactor(endpoints): sync registry_access * fix(db): rename migration functions * fix(registries): show accesses for admin * fix(kube): set token on transport * refactor(kube): move secret help to bottom * fix(kuberentes): remove shouldLog parameter * style(auth): add description of security.IsAdmin * feat(security): allow admin access to registry * feat(edge): connect to edge endpoint when creating client * style(portainer): change deprecation version * refactor(sidebar): hide manage * refactor(containers): revert changes * style(container): remove whitespace * fix(endpoint): add handler to registy on endpointService * refactor(image): use endpointService.registries * fix(kueb/namespaces): rename resource pool to namespace * fix(kube/namespace): move selected registries * fix(api/registries): hide accesses on registry creation Co-authored-by: LP B <xAt0mZ@users.noreply.github.com> refactor(api): remove code duplication after rebase fix(app/registries): replace last registry api usage by endpoint registry api fix(api/endpoints): update registry access policies on endpoint deletion (#5226) [EE-1027] fix(db): update db version * fix(dockerhub): fetch rate limits * fix(registry/tests): supply restricred context * fix(registries): show proget registry only when selected * fix(registry): create dockerhub registry * feat(db): move migrations to db 32 Co-authored-by: Chaim Lev-Ari <chiptus@gmail.com>
139 lines
5.3 KiB
JavaScript
139 lines
5.3 KiB
JavaScript
import _ from 'lodash-es';
|
|
|
|
import angular from 'angular';
|
|
import KubernetesResourcePoolConverter from 'Kubernetes/converters/resourcePool';
|
|
import KubernetesResourceQuotaHelper from 'Kubernetes/helpers/resourceQuotaHelper';
|
|
|
|
/* @ngInject */
|
|
export function KubernetesResourcePoolService($async, EndpointService, KubernetesNamespaceService, KubernetesResourceQuotaService, KubernetesIngressService) {
|
|
return {
|
|
get,
|
|
create,
|
|
patch,
|
|
delete: _delete,
|
|
};
|
|
|
|
async function getOne(name) {
|
|
try {
|
|
const namespace = await KubernetesNamespaceService.get(name);
|
|
const [quotaAttempt] = await Promise.allSettled([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 function getAll() {
|
|
try {
|
|
const namespaces = await KubernetesNamespaceService.get();
|
|
const pools = await Promise.all(
|
|
_.map(namespaces, async (namespace) => {
|
|
const name = namespace.Name;
|
|
const [quotaAttempt] = await Promise.allSettled([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;
|
|
}
|
|
}
|
|
|
|
function get(name) {
|
|
if (name) {
|
|
return $async(getOne, name);
|
|
}
|
|
return $async(getAll);
|
|
}
|
|
|
|
function create(formValues) {
|
|
return $async(async () => {
|
|
try {
|
|
const [namespace, quota, ingresses, registries] = KubernetesResourcePoolConverter.formValuesToResourcePool(formValues);
|
|
await KubernetesNamespaceService.create(namespace);
|
|
|
|
if (quota) {
|
|
await KubernetesResourceQuotaService.create(quota);
|
|
}
|
|
const ingressPromises = _.map(ingresses, (i) => KubernetesIngressService.create(i));
|
|
await Promise.all(ingressPromises);
|
|
|
|
const endpointId = formValues.EndpointId;
|
|
const registriesPromises = _.map(registries, (r) => EndpointService.updateRegistryAccess(endpointId, r.Id, r.RegistryAccesses[endpointId]));
|
|
await Promise.all(registriesPromises);
|
|
} catch (err) {
|
|
throw err;
|
|
}
|
|
});
|
|
}
|
|
|
|
function patch(oldFormValues, newFormValues) {
|
|
return $async(async () => {
|
|
try {
|
|
const [oldNamespace, oldQuota, oldIngresses, oldRegistries] = KubernetesResourcePoolConverter.formValuesToResourcePool(oldFormValues);
|
|
const [newNamespace, newQuota, newIngresses, newRegistries] = KubernetesResourcePoolConverter.formValuesToResourcePool(newFormValues);
|
|
void oldNamespace, newNamespace;
|
|
|
|
if (oldQuota && newQuota) {
|
|
await KubernetesResourceQuotaService.patch(oldQuota, newQuota);
|
|
} else if (!oldQuota && newQuota) {
|
|
await KubernetesResourceQuotaService.create(newQuota);
|
|
} else if (oldQuota && !newQuota) {
|
|
await KubernetesResourceQuotaService.delete(oldQuota);
|
|
}
|
|
|
|
const create = _.filter(newIngresses, (ing) => !_.find(oldIngresses, { Name: ing.Name }));
|
|
const del = _.filter(oldIngresses, (ing) => !_.find(newIngresses, { Name: ing.Name }));
|
|
const patch = _.without(newIngresses, ...create);
|
|
|
|
const createPromises = _.map(create, (i) => KubernetesIngressService.create(i));
|
|
const delPromises = _.map(del, (i) => KubernetesIngressService.delete(i.Namespace, i.Name));
|
|
const patchPromises = _.map(patch, (ing) => {
|
|
const old = _.find(oldIngresses, { Name: ing.Name });
|
|
ing.Paths = angular.copy(old.Paths);
|
|
ing.PreviousHost = old.Host;
|
|
return KubernetesIngressService.patch(old, ing);
|
|
});
|
|
|
|
const promises = _.flatten([createPromises, delPromises, patchPromises]);
|
|
await Promise.all(promises);
|
|
|
|
const endpointId = newFormValues.EndpointId;
|
|
const keptRegistries = _.intersectionBy(oldRegistries, newRegistries, 'Id');
|
|
const removedRegistries = _.without(oldRegistries, ...keptRegistries);
|
|
|
|
const newRegistriesPromises = _.map(newRegistries, (r) => EndpointService.updateRegistryAccess(endpointId, r.Id, r.RegistryAccesses[endpointId]));
|
|
const removedRegistriesPromises = _.map(removedRegistries, (r) => {
|
|
_.pull(r.RegistryAccesses[endpointId].Namespaces, newFormValues.Name);
|
|
return EndpointService.updateRegistryAccess(endpointId, r.Id, r.RegistryAccesses[endpointId]);
|
|
});
|
|
|
|
await Promise.all(_.concat(newRegistriesPromises, removedRegistriesPromises));
|
|
} catch (err) {
|
|
throw err;
|
|
}
|
|
});
|
|
}
|
|
|
|
function _delete(pool) {
|
|
return $async(async () => {
|
|
try {
|
|
await KubernetesNamespaceService.delete(pool.Namespace);
|
|
} catch (err) {
|
|
throw err;
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
angular.module('portainer.kubernetes').service('KubernetesResourcePoolService', KubernetesResourcePoolService);
|