github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(swarm/services): avoid sending credSpec object when empty EE-6178 (#10441)

pull/10459/head
matias-portainer 2023-10-11 11:30:23 -03:00 committed by GitHub
parent 35dfde70de
commit da5a4d6714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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