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

fix(kubernetes): fix redeploying kubernetes app EE-2875 (#6984)

Browse source
This commit is contained in:
Prabhat Khera 2022-05-31 10:12:37 +12:00 • committed by GitHub
parent c162e180e0
commit 71c0e8e661
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/kubernetes/services/applicationService.js
View file

@ -237,7 +237,6 @@ class KubernetesApplicationService {
}
if (service) {
await this.KubernetesServiceService.create(service);
if (formValues.PublishingType === KubernetesApplicationPublishingTypes.INGRESS) {
const ingresses = KubernetesIngressConverter.applicationFormValuesToIngresses(formValues, service.Name);
await Promise.all(this._generateIngressPatchPromises(formValues.OriginalIngresses, ingresses));
@ -281,19 +280,24 @@ class KubernetesApplicationService {
* in this method should also be displayed in the summary output (getUpdatedApplicationResources)
*/
async patchAsync(oldFormValues, newFormValues) {
const [oldApp, oldHeadlessService, oldServices, oldService, oldClaims] = KubernetesApplicationConverter.applicationFormValuesToApplication(oldFormValues);
const [newApp, newHeadlessService, newServices, newService, newClaims] = KubernetesApplicationConverter.applicationFormValuesToApplication(newFormValues);
const [oldApp, oldHeadlessService, oldServices, , oldClaims] = KubernetesApplicationConverter.applicationFormValuesToApplication(oldFormValues);
const [newApp, newHeadlessService, newServices, , newClaims] = KubernetesApplicationConverter.applicationFormValuesToApplication(newFormValues);
const oldApiService = this._getApplicationApiService(oldApp);
const newApiService = this._getApplicationApiService(newApp);
if (oldApiService !== newApiService) {
// delete services first
if (oldServices) {
await this.KubernetesServiceService.delete(oldServices);
}
// delete the app
await this.delete(oldApp);
if (oldService) {
await this.KubernetesServiceService.delete(oldService);
}
if (newService) {
return '';
}
// sleep for 5 seconds to allow the app/services to be deleted
await new Promise((r) => setTimeout(r, 5000));
// create the app
return await this.create(newFormValues);
}