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

fix(app): allow editing pod services [EE-6480] (#10875)

Browse source 
* fix(app): allow editing pod services [EE-6480]
* address review comment

---------

Co-authored-by: testa113 <testa113>
Co-authored-by: prabhat khera <prabhat.khera@portainer.io>
This commit is contained in:
Ali 2024-01-23 10:10:16 +13:00 • committed by GitHub
parent 7cba02226e
commit 4c0049edbe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 60 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
import KubernetesDeploymentConverter from 'Kubernetes/converters/deployment';
import KubernetesDaemonSetConverter from 'Kubernetes/converters/daemonSet';
import KubernetesStatefulSetConverter from 'Kubernetes/converters/statefulSet';
import KubernetesPodConverter from 'Kubernetes/pod/converter';
import KubernetesServiceConverter from 'Kubernetes/converters/service';
import KubernetesPersistentVolumeClaimConverter from 'Kubernetes/converters/persistentVolumeClaim';
import PortainerError from 'Portainer/error';
@ -55,6 +56,8 @@ class KubernetesApplicationConverter {
res.Id = data.metadata.uid;
res.Name = data.metadata.name;
res.Metadata = data.metadata;
res.ApplicationType = data.kind;
res.Labels = data.metadata.labels || {};
if (data.metadata.labels) {
const { labels } = data.metadata;
@ -281,6 +284,7 @@ class KubernetesApplicationConverter {
res.ApplicationType = app.ApplicationType;
res.ResourcePool = _.find(resourcePools, ['Namespace.Name', app.ResourcePool]);
res.Name = app.Name;
res.Labels = app.Labels;
res.Services = KubernetesApplicationHelper.generateServicesFormValuesFromServices(app, ingresses);
res.Selector = KubernetesApplicationHelper.generateSelectorFromService(app);
res.StackName = app.StackName;
@ -341,6 +345,8 @@ class KubernetesApplicationConverter {
(claims.length === 0 || (claims.length > 0 && formValues.DataAccessPolicy === KubernetesApplicationDataAccessPolicies.Shared && rwx))) ||
formValues.ApplicationType === KubernetesApplicationTypes.DaemonSet;
const pod = formValues.ApplicationType === KubernetesApplicationTypes.POD;
let app;
if (deployment) {
app = KubernetesDeploymentConverter.applicationFormValuesToDeployment(formValues, claims);
@ -348,6 +354,8 @@ class KubernetesApplicationConverter {
app = KubernetesStatefulSetConverter.applicationFormValuesToStatefulSet(formValues, claims);
} else if (daemonSet) {
app = KubernetesDaemonSetConverter.applicationFormValuesToDaemonSet(formValues, claims);
} else if (pod) {
app = KubernetesPodConverter.applicationFormValuesToPod(formValues, claims);
} else {
throw new PortainerError('Unable to determine which association to use to convert form');
}