blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
ArrisLee
2021-06-11 14:14:31 +12:00
parent 0b85684168 29166e1eab
commit c4e2ca1fb9
8 changed files with 401 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/portainer/services/api/stackService.js
View File

@@ -367,21 +367,16 @@ angular.module('portainer.app').factory('StackService', [
return action(name, stackFileContent, env, endpointId);
};
async function kubernetesDeployAsync(endpointId, namespace, content, compose) {
async function kubernetesDeployAsync(endpointId, method, payload) {
try {
const payload = {
StackFileContent: content,
ComposeFormat: compose,
Namespace: namespace,
};
await Stack.create({ method: 'undefined', type: 3, endpointId: endpointId }, payload).$promise;
await Stack.create({ endpointId: endpointId, method: method, type: 3 }, payload).$promise;
} catch (err) {
throw { err: err };
}
}
service.kubernetesDeploy = function (endpointId, namespace, content, compose) {
return $async(kubernetesDeployAsync, endpointId, namespace, content, compose);
service.kubernetesDeploy = function (endpointId, method, payload) {
return $async(kubernetesDeployAsync, endpointId, method, payload);
};
service.start = start;