mirror of https://github.com/portainer/portainer
fix issue on editing app with persisted folder (#6646)
Co-authored-by: Richard Wei <dgui.wei@gmail.com>pull/6728/head
parent
2059a9e064
commit
7e28b3ca3f
|
@ -281,6 +281,8 @@ class KubernetesApplicationHelper {
|
||||||
let services = [];
|
let services = [];
|
||||||
if (app.Services) {
|
if (app.Services) {
|
||||||
app.Services.forEach(function (service) {
|
app.Services.forEach(function (service) {
|
||||||
|
//skip generate formValues if service = headless service ( clusterIp === "None" )
|
||||||
|
if (service.spec.clusterIP !== 'None') {
|
||||||
const svc = new KubernetesService();
|
const svc = new KubernetesService();
|
||||||
svc.Namespace = service.metadata.namespace;
|
svc.Namespace = service.metadata.namespace;
|
||||||
svc.Name = service.metadata.name;
|
svc.Name = service.metadata.name;
|
||||||
|
@ -322,6 +324,7 @@ class KubernetesApplicationHelper {
|
||||||
svc.Ports = ports;
|
svc.Ports = ports;
|
||||||
svc.Selector = app.Raw.spec.selector.matchLabels;
|
svc.Selector = app.Raw.spec.selector.matchLabels;
|
||||||
services.push(svc);
|
services.push(svc);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return services;
|
return services;
|
||||||
|
|
|
@ -429,10 +429,10 @@ class KubernetesApplicationService {
|
||||||
if (apiService === this.KubernetesStatefulSetService) {
|
if (apiService === this.KubernetesStatefulSetService) {
|
||||||
const headlessServicePayload = angular.copy(payload);
|
const headlessServicePayload = angular.copy(payload);
|
||||||
headlessServicePayload.Name = application instanceof KubernetesStatefulSet ? application.ServiceName : application.HeadlessServiceName;
|
headlessServicePayload.Name = application instanceof KubernetesStatefulSet ? application.ServiceName : application.HeadlessServiceName;
|
||||||
await this.KubernetesServiceService.delete(headlessServicePayload);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (application.ServiceType) {
|
if (application.ServiceType) {
|
||||||
|
// delete headless service && non-headless service
|
||||||
await this.KubernetesServiceService.delete(application.Services);
|
await this.KubernetesServiceService.delete(application.Services);
|
||||||
|
|
||||||
if (application.Ingresses.length) {
|
if (application.Ingresses.length) {
|
||||||
|
|
|
@ -257,7 +257,7 @@
|
||||||
This application is not exposing any port.
|
This application is not exposing any port.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="ctrl.application.PublishedPorts.length > 0">
|
<div ng-if="ctrl.application.Services.length !== 0">
|
||||||
<!-- Services notice -->
|
<!-- Services notice -->
|
||||||
<div>
|
<div>
|
||||||
<div class="small text-muted">
|
<div class="small text-muted">
|
||||||
|
|
|
@ -237,6 +237,8 @@ function getVolumeClaimUpdateResourceSummary(oldPVC, newPVC) {
|
||||||
// getServiceUpdateResourceSummary replicates KubernetesServiceService.patch
|
// getServiceUpdateResourceSummary replicates KubernetesServiceService.patch
|
||||||
function getServiceUpdateResourceSummary(oldServices, newServices) {
|
function getServiceUpdateResourceSummary(oldServices, newServices) {
|
||||||
let summary = [];
|
let summary = [];
|
||||||
|
// skip update summary when service is headless service
|
||||||
|
if (!oldServices.Headless) {
|
||||||
newServices.forEach((newService) => {
|
newServices.forEach((newService) => {
|
||||||
const oldServiceMatched = _.find(oldServices, { Name: newService.Name });
|
const oldServiceMatched = _.find(oldServices, { Name: newService.Name });
|
||||||
if (oldServiceMatched) {
|
if (oldServiceMatched) {
|
||||||
|
@ -267,7 +269,7 @@ function getServiceUpdateResourceSummary(oldServices, newServices) {
|
||||||
summary.push(serviceDelete);
|
summary.push(serviceDelete);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
if (summary.length !== 0) {
|
if (summary.length !== 0) {
|
||||||
return summary;
|
return summary;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue