Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 07:49:41 +02:00
Code Issues Releases Activity

fix(k8s/resource-pool): unusable RP access management (#4810)

Browse source
This commit is contained in:
LP B 2021-02-03 06:38:56 +01:00 • committed by GitHub
parent d2d7f6fdb9
commit e401724d43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 87 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/kubernetes/views/resource-pools/access/resourcePoolAccessController.js
View file

@ -52,7 +52,7 @@ class KubernetesResourcePoolAccessController {
let [endpoint, pool, configMap] = await Promise.all([
this.EndpointService.endpoint(this.endpointId),
this.KubernetesResourcePoolService.get(name),
this.KubernetesConfigMapService.get(KubernetesPortainerConfigMapNamespace, KubernetesPortainerConfigMapConfigName),
this.KubernetesConfigMapService.getAccess(KubernetesPortainerConfigMapNamespace, KubernetesPortainerConfigMapConfigName),
]);
const group = await this.GroupService.group(endpoint.GroupId);
const roles = [];
@ -96,7 +96,7 @@ class KubernetesResourcePoolAccessController {
this.state.actionInProgress = true;
const newAccesses = _.concat(this.authorizedUsersAndTeams, this.formValues.multiselectOutput);
const accessConfigMap = KubernetesConfigMapHelper.modifiyNamespaceAccesses(angular.copy(this.accessConfigMap), this.pool.Namespace.Name, newAccesses);
await this.KubernetesConfigMapService.update(accessConfigMap);
await this.KubernetesConfigMapService.updateAccess(accessConfigMap);
this.Notifications.success('Access successfully created');
this.$state.reload();
} catch (err) {
@ -116,7 +116,7 @@ class KubernetesResourcePoolAccessController {
this.state.actionInProgress = true;
const newAccesses = _.without(this.authorizedUsersAndTeams, ...selectedItems);
const accessConfigMap = KubernetesConfigMapHelper.modifiyNamespaceAccesses(angular.copy(this.accessConfigMap), this.pool.Namespace.Name, newAccesses);
await this.KubernetesConfigMapService.update(accessConfigMap);
await this.KubernetesConfigMapService.updateAccess(accessConfigMap);
this.Notifications.success('Access successfully removed');
this.$state.reload();
} catch (err) {