github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/7002/head
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
Show Stats 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);
}

4
app/kubernetes/services/serviceService.js
View File

@ -101,8 +101,8 @@ class KubernetesServiceService {
services.forEach(async (service) => {
try {
const params = new KubernetesCommonParams();
params.id = service.metadata.name;
const namespace = service.metadata.namespace;
params.id = (service.metadata && service.metadata.name) || service.Name;
const namespace = (service.metadata && service.metadata.namespace) || service.Namespace;
await this.KubernetesServices(namespace).delete(params).$promise;
} catch (err) {
// eslint-disable-next-line no-console