Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 13:55:21 +02:00
Code Issues Releases Activity

fix(swarm/services): avoid sending credSpec object when empty [EE-6322] (#10636)

Browse source 
Co-authored-by: matias-portainer <104775949+matias-portainer@users.noreply.github.com>
This commit is contained in:
Chaim Lev-Ari 2023-11-26 07:01:58 +02:00 • committed by GitHub
parent cd9ad97235
commit 5dad419f60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/docker/views/services/edit/serviceController.js
View file

@ -474,7 +474,7 @@ angular.module('portainer.docker').controller('ServiceController', [
''; '';
if (oldCredSpecId && !credSpecId) { if (oldCredSpecId && !credSpecId) {
delete config.TaskTemplate.ContainerSpec.Privileges.CredentialSpec; delete config.TaskTemplate.ContainerSpec.Privileges.CredentialSpec;
} else if (oldCredSpecId !== credSpec) { } else if (credSpec && oldCredSpecId !== credSpec) {
config.TaskTemplate.ContainerSpec.Privileges = { config.TaskTemplate.ContainerSpec.Privileges = {
...(config.TaskTemplate.ContainerSpec.Privileges || {}), ...(config.TaskTemplate.ContainerSpec.Privileges || {}),
CredentialSpec: { CredentialSpec: {
@ -854,6 +854,10 @@ angular.module('portainer.docker').controller('ServiceController', [
$scope.filterConfigs = filterConfigs; $scope.filterConfigs = filterConfigs;
function filterConfigs(configs) { function filterConfigs(configs) {
if (!configs) {
return [];
}
return configs.filter((config) => $scope.service.ServiceConfigs.every((serviceConfig) => config.Id !== serviceConfig.Id)); return configs.filter((config) => $scope.service.ServiceConfigs.every((serviceConfig) => config.Id !== serviceConfig.Id));
} }