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

feat(k8s): Allow mix services for k8s app EE-1791 (#6198)

Browse source 
allow a mix of services for k8s in ui
This commit is contained in:
Richard Wei 2022-01-17 08:37:46 +13:00 • committed by GitHub
parent edf048570b
commit c47e840b37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 2336 additions and 1863 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/kubernetes/converters/application.js
View file

@ -120,6 +120,8 @@ class KubernetesApplicationConverter {
res.ServiceType = serviceType;
res.ServiceId = service.metadata.uid;
res.ServiceName = service.metadata.name;
res.ClusterIp = service.spec.clusterIP;
res.ExternalIp = service.spec.externalIP;
if (serviceType === KubernetesServiceTypes.LOAD_BALANCER) {
if (service.status.loadBalancer.ingress && service.status.loadBalancer.ingress.length > 0) {
@ -279,6 +281,8 @@ class KubernetesApplicationConverter {
res.ApplicationType = app.ApplicationType;
res.ResourcePool = _.find(resourcePools, ['Namespace.Name', app.ResourcePool]);
res.Name = app.Name;
res.Services = KubernetesApplicationHelper.generateServicesFormValuesFromServices(app);
res.Selector = KubernetesApplicationHelper.generateSelectorFromService(app);
res.StackName = app.StackName;
res.ApplicationOwner = app.ApplicationOwner;
res.ImageModel.Image = app.Image;
@ -356,7 +360,9 @@ class KubernetesApplicationConverter {
service = undefined;
}
return [app, headlessService, service, claims];
let services = KubernetesServiceConverter.applicationFormValuesToServices(formValues);
return [app, headlessService, services, service, claims];
}
}

65
app/kubernetes/converters/service.js
View file

@ -52,10 +52,59 @@ class KubernetesServiceConverter {
return res;
}
static applicationFormValuesToServices(formValues) {
let services = [];
formValues.Services.forEach(function (service) {
const res = new KubernetesService();
res.Namespace = formValues.ResourcePool.Namespace.Name;
res.Name = service.Name;
res.StackName = formValues.StackName ? formValues.StackName : formValues.Name;
res.ApplicationOwner = formValues.ApplicationOwner;
res.ApplicationName = formValues.Name;
if (service.Type === KubernetesApplicationPublishingTypes.NODE_PORT) {
res.Type = KubernetesServiceTypes.NODE_PORT;
} else if (service.Type === KubernetesApplicationPublishingTypes.LOAD_BALANCER) {
res.Type = KubernetesServiceTypes.LOAD_BALANCER;
} else if (service.Type === KubernetesApplicationPublishingTypes.CLUSTER_IP) {
res.Type = KubernetesServiceTypes.CLUSTER_IP;
}
res.Ingress = service.Ingress;
if (service.Selector !== undefined) {
res.Selector = service.Selector;
} else {
res.Selector = {
app: formValues.Name,
};
}
let ports = [];
service.Ports.forEach(function (port, index) {
const res = new KubernetesServicePort();
res.name = 'port-' + index;
res.port = port.port;
if (port.nodePort) {
res.nodePort = port.nodePort;
}
res.protocol = port.protocol;
res.targetPort = port.targetPort;
res.ingress = port.ingress;
ports.push(res);
});
res.Ports = ports;
services.push(res);
});
return services;
}
static applicationFormValuesToHeadlessService(formValues) {
const res = KubernetesServiceConverter.applicationFormValuesToService(formValues);
res.Name = KubernetesServiceHelper.generateHeadlessServiceName(formValues.Name);
res.Headless = true;
res.Selector = {
app: formValues.Name,
};
return res;
}
@ -70,8 +119,20 @@ class KubernetesServiceConverter {
payload.metadata.labels[KubernetesPortainerApplicationStackNameLabel] = service.StackName;
payload.metadata.labels[KubernetesPortainerApplicationNameLabel] = service.ApplicationName;
payload.metadata.labels[KubernetesPortainerApplicationOwnerLabel] = service.ApplicationOwner;
payload.spec.ports = service.Ports;
payload.spec.selector.app = service.ApplicationName;
const ports = [];
service.Ports.forEach((port) => {
const p = {};
p.name = port.name;
p.port = port.port;
p.nodePort = port.nodePort;
p.protocol = port.protocol;
p.targetPort = port.targetPort;
ports.push(p);
});
payload.spec.ports = ports;
payload.spec.selector = service.Selector;
if (service.Headless) {
payload.spec.clusterIP = KubernetesServiceHeadlessClusterIP;
delete payload.spec.ports;