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

Merge branch 'release/2.5' into develop

pull/4894/merge
yi-portainer 2021-05-24 08:53:10 +12:00
parent 0114766d50 819faa3948
commit 2270de73ee
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/http/handler/endpointproxy/proxy_kubernetes.go
View File

@ -77,5 +77,5 @@ func (handler *Handler) proxyRequestsToKubernetesAPI(w http.ResponseWriter, r *h
}
func isKubernetesRequest(requestURL string) bool {
return strings.HasPrefix(requestURL, "/api")
return strings.HasPrefix(requestURL, "/api") || strings.HasPrefix(requestURL, "/healthz")
}

6
app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js
View File

@ -5,7 +5,9 @@ export class EditEdgeStackFormController {
}
editorUpdate(cm) {
this.model.StackFileContent = cm.getValue();
this.isEditorDirty = true;
if (this.model.StackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
this.model.StackFileContent = cm.getValue();
this.isEditorDirty = true;
}
}
}

6
app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationDataController.js
View File

@ -43,8 +43,10 @@ class KubernetesConfigurationDataController {
}
async editorUpdateAsync(cm) {
this.formValues.DataYaml = cm.getValue();
this.isEditorDirty = true;
if (this.formValues.DataYaml !== cm.getValue()) {
this.formValues.DataYaml = cm.getValue();
this.isEditorDirty = true;
}
}
editorUpdate(cm) {

6
app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js
View File

@ -96,8 +96,10 @@ class EditCustomTemplateViewController {
}
editorUpdate(cm) {
this.formValues.FileContent = cm.getValue();
this.state.isEditorDirty = true;
if (this.formValues.FileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
this.formValues.FileContent = cm.getValue();
this.state.isEditorDirty = true;
}
}
async uiCanExit() {

10
app/portainer/views/stacks/edit/stackController.js
View File

@ -201,12 +201,11 @@ angular.module('portainer.app').controller('StackController', [
};
$scope.editorUpdate = function (cm) {
if ($scope.stackFileContent !== cm.getValue()) {
if ($scope.stackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
$scope.state.isEditorDirty = true;
$scope.stackFileContent = cm.getValue();
$scope.state.yamlError = StackHelper.validateYAML($scope.stackFileContent, $scope.containerNames);
}
$scope.stackFileContent = cm.getValue();
$scope.state.yamlError = StackHelper.validateYAML($scope.stackFileContent, $scope.containerNames);
$scope.state.isEditorDirty = true;
};
$scope.stopStack = stopStack;
@ -269,8 +268,7 @@ angular.module('portainer.app').controller('StackController', [
var stack = data.stack;
$scope.groups = data.groups;
$scope.stack = stack;
$scope.containers = data.containers;
$scope.containerNames = ContainerHelper.getContainerNames($scope.containers);
$scope.containerNames = ContainerHelper.getContainerNames(data.containers);
let resourcesPromise = Promise.resolve({});
if (stack.Status === 1) {