Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 07:49:41 +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];
}
}