Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-28 01:39:39 +02:00
Code Issues Releases Activity

fix(cluster): fix cluster setup no ingress develop EE-4352 (#7776)

Browse source 
* fix(cluster) update cluster wo controllers EE-4352

* fix(ing): stop errors in ns EE-4352
This commit is contained in:
Ali 2022-10-04 12:13:56 +13:00 • committed by GitHub
parent 7d8b037761
commit 1722257d68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/kubernetes/views/configure/configureController.js
View file

@ -198,7 +198,7 @@ class KubernetesConfigureController {
this.assignFormValuesToEndpoint(this.endpoint, storageClasses, ingressClasses);
await this.EndpointService.updateEndpoint(this.endpoint.Id, this.endpoint);
// updateIngressControllerClassMap must be done after updateEndpoint, as a hacky workaround. A better solution: saving ingresscontrollers somewhere else, is being discussed
await updateIngressControllerClassMap(this.state.endpointId, this.ingressControllers);
await updateIngressControllerClassMap(this.state.endpointId, this.ingressControllers || []);
this.state.isSaving = true;
const storagePromises = _.map(storageClasses, (storageClass) => {
const oldStorageClass = _.find(this.oldStorageClasses, { Name: storageClass.Name });
@ -224,19 +224,7 @@ class KubernetesConfigureController {
}
configure() {
const toDel = _.filter(this.formValues.IngressClasses, { NeedsDeletion: true });
if (toDel.length) {
this.ModalService.confirmUpdate(
`Removing ingress controllers may cause applications to be unaccessible. All ingress configurations from affected applications will be removed.<br/><br/>Do you wish to continue?`,
(confirmed) => {
if (confirmed) {
return this.$async(this.configureAsync);
}
}
);
} else {
return this.$async(this.configureAsync);
}
return this.$async(this.configureAsync);
}
/* #endregion */
@ -292,6 +280,7 @@ class KubernetesConfigureController {
IngressAvailabilityPerNamespace: false,
};
this.isIngressControllersLoading = true;
try {
this.availableAccessModes = new KubernetesStorageClassAccessPolicies();
@ -332,6 +321,7 @@ class KubernetesConfigureController {
this.Notifications.error('Failure', err, 'Unable to retrieve environment configuration');
} finally {
this.state.viewReady = true;
this.isIngressControllersLoading = false;
}
window.addEventListener('beforeunload', this.onBeforeOnload);