1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-22 06:49:40 +02:00

fix(ing): nodeport validate and show errors [EE-4373] (#7801)

This commit is contained in:
Ali 2022-10-12 10:06:57 +13:00 committed by GitHub
parent fd91de3571
commit 7a6ff10268
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 135 additions and 62 deletions

View file

@ -13,6 +13,7 @@ import KubernetesServiceHelper from 'Kubernetes/helpers/serviceHelper';
import { KubernetesHorizontalPodAutoScalerHelper } from 'Kubernetes/horizontal-pod-auto-scaler/helper';
import { KubernetesHorizontalPodAutoScalerConverter } from 'Kubernetes/horizontal-pod-auto-scaler/converter';
import KubernetesPodConverter from 'Kubernetes/pod/converter';
import { notifyError } from '@/portainer/services/notifications';
class KubernetesApplicationService {
/* #region CONSTRUCTOR */
@ -213,7 +214,11 @@ class KubernetesApplicationService {
if (services) {
services.forEach(async (service) => {
await this.KubernetesServiceService.create(service);
try {
await this.KubernetesServiceService.create(service);
} catch (error) {
notifyError('Unable to create service', error);
}
});
}
@ -221,7 +226,11 @@ class KubernetesApplicationService {
if (app instanceof KubernetesStatefulSet) {
app.VolumeClaims = claims;
headlessService = await this.KubernetesServiceService.create(headlessService);
try {
headlessService = await this.KubernetesServiceService.create(headlessService);
} catch (error) {
notifyError('Unable to create service', error);
}
app.ServiceName = headlessService.metadata.name;
} else {
const claimPromises = _.map(claims, (item) => {
@ -276,7 +285,11 @@ class KubernetesApplicationService {
}
if (newApp instanceof KubernetesStatefulSet) {
await this.KubernetesServiceService.patch(oldHeadlessService, newHeadlessService);
try {
await this.KubernetesServiceService.patch(oldHeadlessService, newHeadlessService);
} catch (error) {
notifyError('Unable to update service', error);
}
} else {
const claimPromises = _.map(newClaims, (newClaim) => {
if (!newClaim.PreviousName && !newClaim.Id) {
@ -294,7 +307,11 @@ class KubernetesApplicationService {
// Create services
if (oldServices.length === 0 && newServices.length !== 0) {
newServices.forEach(async (service) => {
await this.KubernetesServiceService.create(service);
try {
await this.KubernetesServiceService.create(service);
} catch (error) {
notifyError('Unable to create service', error);
}
});
}
@ -315,9 +332,17 @@ class KubernetesApplicationService {
newServices.forEach(async (newService) => {
const oldServiceMatched = _.find(oldServices, { Name: newService.Name });
if (oldServiceMatched) {
await this.KubernetesServiceService.patch(oldServiceMatched, newService);
try {
await this.KubernetesServiceService.patch(oldServiceMatched, newService);
} catch (error) {
notifyError('Unable to update service', error);
}
} else {
await this.KubernetesServiceService.create(newService);
try {
await this.KubernetesServiceService.create(newService);
} catch (error) {
notifyError('Unable to create service', error);
}
}
});
}