Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 15:29:42 +02:00
Code Issues Releases Activity

fix issue on editing app with persisted folder (#6646)

Browse source 
Co-authored-by: Richard Wei <dgui.wei@gmail.com>
This commit is contained in:
Richard Wei 2022-04-06 05:42:01 +12:00 • committed by GitHub
parent 2059a9e064
commit 7e28b3ca3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

79
app/kubernetes/helpers/application/index.js
View file

@ -281,47 +281,50 @@ class KubernetesApplicationHelper {
let services = [];
if (app.Services) {
app.Services.forEach(function (service) {
const svc = new KubernetesService();
svc.Namespace = service.metadata.namespace;
svc.Name = service.metadata.name;
svc.StackName = service.StackName;
svc.ApplicationOwner = app.ApplicationOwner;
svc.ApplicationName = app.ApplicationName;
svc.Type = service.spec.type;
if (service.spec.type === KubernetesServiceTypes.CLUSTER_IP) {
svc.Type = 1;
} else if (service.spec.type === KubernetesServiceTypes.NODE_PORT) {
svc.Type = 2;
} else if (service.spec.type === KubernetesServiceTypes.LOAD_BALANCER) {
svc.Type = 3;
}
//skip generate formValues if service = headless service ( clusterIp === "None" )
if (service.spec.clusterIP !== 'None') {
const svc = new KubernetesService();
svc.Namespace = service.metadata.namespace;
svc.Name = service.metadata.name;
svc.StackName = service.StackName;
svc.ApplicationOwner = app.ApplicationOwner;
svc.ApplicationName = app.ApplicationName;
svc.Type = service.spec.type;
if (service.spec.type === KubernetesServiceTypes.CLUSTER_IP) {
svc.Type = 1;
} else if (service.spec.type === KubernetesServiceTypes.NODE_PORT) {
svc.Type = 2;
} else if (service.spec.type === KubernetesServiceTypes.LOAD_BALANCER) {
svc.Type = 3;
}
let ports = [];
service.spec.ports.forEach(function (port) {
const svcport = new KubernetesServicePort();
svcport.name = port.name;
svcport.port = port.port;
svcport.nodePort = port.nodePort;
svcport.protocol = port.protocol;
svcport.targetPort = port.targetPort;
let ports = [];
service.spec.ports.forEach(function (port) {
const svcport = new KubernetesServicePort();
svcport.name = port.name;
svcport.port = port.port;
svcport.nodePort = port.nodePort;
svcport.protocol = port.protocol;
svcport.targetPort = port.targetPort;
app.Ingresses.value.forEach((ingress) => {
const ingressMatched = _.find(ingress.Paths, { ServiceName: service.metadata.name });
if (ingressMatched) {
svcport.ingress = {
IngressName: ingressMatched.IngressName,
Host: ingressMatched.Host,
Path: ingressMatched.Path,
};
svc.Ingress = true;
}
app.Ingresses.value.forEach((ingress) => {
const ingressMatched = _.find(ingress.Paths, { ServiceName: service.metadata.name });
if (ingressMatched) {
svcport.ingress = {
IngressName: ingressMatched.IngressName,
Host: ingressMatched.Host,
Path: ingressMatched.Path,
};
svc.Ingress = true;
}
});
ports.push(svcport);
});
ports.push(svcport);
});
svc.Ports = ports;
svc.Selector = app.Raw.spec.selector.matchLabels;
services.push(svc);
svc.Ports = ports;
svc.Selector = app.Raw.spec.selector.matchLabels;
services.push(svc);
}
});
return services;