mirror of
https://github.com/portainer/portainer.git
synced 2025-07-19 13:29:41 +02:00
* feat(stack): backport changes to CE EE-1189 * feat(stack): front end backport changes to CE EE-1199 (#5455) * feat(stack): front end backport changes to CE EE-1199 * fix k8s deploy logic * fixed web editor confirmation message typo. EE-1501 * fix(stack): fixed issue auth detail not remembered EE-1502 (#5459) * show status in buttons * removed onChangeRef function. * moved buttons in git form to its own component * removed unused variable. Co-authored-by: ArrisLee <arris_li@hotmail.com> * moved formvalue to kube app component * fix(stack): failed to pull and redeploy compose format k8s stack * fixed form value * fix(k8s): file content overridden when deployment failed with compose format EE-1548 * updated API response to get IsComposeFormat and show appropriate text. * feat(k8s): front end backport to CE * feat(kube): kube app auto update backend (#5547) * error message updates for different file type * not display creation source for external application * added confirmation modal to advanced app created by web editor * stop showing confirmation modal when updating application * disable rollback button when application type is not applicatiom form * only update file after deployment succeded * Revert "only update file after deployment succeded" This reverts commitb94bd2e96f
. * fix(k8s): file content overridden when deployment failed with compose format EE-1556 * added analytics-on directive to pull and redeploy button * fix(kube): don't valide resource control access for kube (#5568) * added missing question mark to k8s confirmation modal * fixed webhook format issue * added question marks to k8s app confirmation modal * added space in additional file list. * ignoring error on deletion * fix(k8s): Git authentication info not persisted * added RepositoryMechanismTypes constant * updated analytics functions * covert RepositoryMechanism to constant * fixed typo * removed unused function. * post tech review updates * fixed save settings n redeploy button * refact kub deploy logic * Revert "refact kub deploy logic" This reverts commitcbfdd58ece
. * feat(k8s): utilize user token for k8s auto update EE-1594 * feat(k8s): persist kub stack name EE-1630 * feat(k8s): support delete kub stack * fix(app): updated logic to delete stack for different kind apps. (#5648) * fix(app): updated logic to delete stack for different kind apps. * renamed variable * fix import * added StackName field. * fixed stack id not found issue. * fix(k8s): fixed qusetion mark alignment issue in PAT field. (#5611) * fix(k8s): fixed qusetion mark alignment issue in PAT field. * moved inline css to file. * fix(git-form: made auth input text full width * add ignore deleted arg * tech review updates * typo fix * fix(k8s): added console error when deleting k8s service. * fix(console): added no-console config * fix(deploy): added missing service. * fix: use stack editor as an owner when exists (#5678) * fix: tempalte/content based stacks edit/delete * fix(stack): remove stack when no app. (#5769) * fix(stack): remove stack when no app. * support compose format in delete Co-authored-by: ArrisLee <arris_li@hotmail.com> Co-authored-by: Hui <arris_li@hotmail.com> Co-authored-by: fhanportainer <79428273+fhanportainer@users.noreply.github.com> Co-authored-by: Felix Han <felix.han@portainer.io>
86 lines
2.8 KiB
Go
86 lines
2.8 KiB
Go
package stacks
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"sync"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
portainer "github.com/portainer/portainer/api"
|
|
"github.com/portainer/portainer/api/internal/stackutils"
|
|
k "github.com/portainer/portainer/api/kubernetes"
|
|
)
|
|
|
|
type StackDeployer interface {
|
|
DeploySwarmStack(stack *portainer.Stack, endpoint *portainer.Endpoint, registries []portainer.Registry, prune bool) error
|
|
DeployComposeStack(stack *portainer.Stack, endpoint *portainer.Endpoint, registries []portainer.Registry) error
|
|
DeployKubernetesStack(stack *portainer.Stack, endpoint *portainer.Endpoint, user *portainer.User) error
|
|
}
|
|
|
|
type stackDeployer struct {
|
|
lock *sync.Mutex
|
|
swarmStackManager portainer.SwarmStackManager
|
|
composeStackManager portainer.ComposeStackManager
|
|
kubernetesDeployer portainer.KubernetesDeployer
|
|
}
|
|
|
|
// NewStackDeployer inits a stackDeployer struct with a SwarmStackManager, a ComposeStackManager and a KubernetesDeployer
|
|
func NewStackDeployer(swarmStackManager portainer.SwarmStackManager, composeStackManager portainer.ComposeStackManager, kubernetesDeployer portainer.KubernetesDeployer) *stackDeployer {
|
|
return &stackDeployer{
|
|
lock: &sync.Mutex{},
|
|
swarmStackManager: swarmStackManager,
|
|
composeStackManager: composeStackManager,
|
|
kubernetesDeployer: kubernetesDeployer,
|
|
}
|
|
}
|
|
|
|
func (d *stackDeployer) DeploySwarmStack(stack *portainer.Stack, endpoint *portainer.Endpoint, registries []portainer.Registry, prune bool) error {
|
|
d.lock.Lock()
|
|
defer d.lock.Unlock()
|
|
|
|
d.swarmStackManager.Login(registries, endpoint)
|
|
defer d.swarmStackManager.Logout(endpoint)
|
|
|
|
return d.swarmStackManager.Deploy(stack, prune, endpoint)
|
|
}
|
|
|
|
func (d *stackDeployer) DeployComposeStack(stack *portainer.Stack, endpoint *portainer.Endpoint, registries []portainer.Registry) error {
|
|
d.lock.Lock()
|
|
defer d.lock.Unlock()
|
|
|
|
d.swarmStackManager.Login(registries, endpoint)
|
|
defer d.swarmStackManager.Logout(endpoint)
|
|
|
|
return d.composeStackManager.Up(context.TODO(), stack, endpoint)
|
|
}
|
|
|
|
func (d *stackDeployer) DeployKubernetesStack(stack *portainer.Stack, endpoint *portainer.Endpoint, user *portainer.User) error {
|
|
d.lock.Lock()
|
|
defer d.lock.Unlock()
|
|
|
|
appLabels := k.KubeAppLabels{
|
|
StackID: int(stack.ID),
|
|
StackName: stack.Name,
|
|
Owner: user.Username,
|
|
}
|
|
|
|
if stack.GitConfig == nil {
|
|
appLabels.Kind = "content"
|
|
} else {
|
|
appLabels.Kind = "git"
|
|
}
|
|
|
|
manifestFilePaths, tempDir, err := stackutils.CreateTempK8SDeploymentFiles(stack, d.kubernetesDeployer, appLabels)
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to create temp kub deployment files")
|
|
}
|
|
defer os.RemoveAll(tempDir)
|
|
|
|
_, err = d.kubernetesDeployer.Deploy(user.ID, endpoint, manifestFilePaths, stack.Namespace)
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to deploy kubernetes application")
|
|
}
|
|
|
|
return nil
|
|
}
|