mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 15:59:41 +02:00
feat(k8s): support git automated sync for k8s applications [EE-577] (#5548)
* 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>
This commit is contained in:
Dmitry Salakhov
GitHub
parent
fce885901f
commit
2ecc8ab5c9
61 changed files with 1193 additions and 570 deletions
|
|
@ -8,11 +8,12 @@ import (
|
|||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/robfig/cron/v3"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type Scheduler struct {
|
||||
crontab *cron.Cron
|
||||
shutdownCtx context.Context
|
||||
crontab *cron.Cron
|
||||
activeJobs map[cron.EntryID]context.CancelFunc
|
||||
}
|
||||
|
||||
func NewScheduler(ctx context.Context) *Scheduler {
|
||||
|
|
@ -20,7 +21,8 @@ func NewScheduler(ctx context.Context) *Scheduler {
|
|||
crontab.Start()
|
||||
|
||||
s := &Scheduler{
|
||||
crontab: crontab,
|
||||
crontab: crontab,
|
||||
activeJobs: make(map[cron.EntryID]context.CancelFunc),
|
||||
}
|
||||
|
||||
if ctx != nil {
|
||||
|
|
@ -43,8 +45,10 @@ func (s *Scheduler) Shutdown() error {
|
|||
ctx := s.crontab.Stop()
|
||||
<-ctx.Done()
|
||||
|
||||
for _, j := range s.crontab.Entries() {
|
||||
s.crontab.Remove(j.ID)
|
||||
for _, job := range s.crontab.Entries() {
|
||||
if cancel, ok := s.activeJobs[job.ID]; ok {
|
||||
cancel()
|
||||
}
|
||||
}
|
||||
|
||||
err := ctx.Err()
|
||||
|
|
@ -60,14 +64,36 @@ func (s *Scheduler) StopJob(jobID string) error {
|
|||
if err != nil {
|
||||
return errors.Wrapf(err, "failed convert jobID %q to int", jobID)
|
||||
}
|
||||
s.crontab.Remove(cron.EntryID(id))
|
||||
entryID := cron.EntryID(id)
|
||||
if cancel, ok := s.activeJobs[entryID]; ok {
|
||||
cancel()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// StartJobEvery schedules a new periodic job with a given duration.
|
||||
// Returns job id that could be used to stop the given job
|
||||
func (s *Scheduler) StartJobEvery(duration time.Duration, job func()) string {
|
||||
entryId := s.crontab.Schedule(cron.Every(duration), cron.FuncJob(job))
|
||||
return strconv.Itoa(int(entryId))
|
||||
// Returns job id that could be used to stop the given job.
|
||||
// When job run returns an error, that job won't be run again.
|
||||
func (s *Scheduler) StartJobEvery(duration time.Duration, job func() error) string {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
j := cron.FuncJob(func() {
|
||||
if err := job(); err != nil {
|
||||
logrus.Debug("job returned an error")
|
||||
cancel()
|
||||
}
|
||||
})
|
||||
|
||||
entryID := s.crontab.Schedule(cron.Every(duration), j)
|
||||
|
||||
s.activeJobs[entryID] = cancel
|
||||
|
||||
go func(entryID cron.EntryID) {
|
||||
<-ctx.Done()
|
||||
logrus.Debug("job cancelled, stopping")
|
||||
s.crontab.Remove(entryID)
|
||||
}(entryID)
|
||||
|
||||
return strconv.Itoa(int(entryID))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,49 +9,92 @@ import (
|
|||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func Test_CanStartAndTerminate(t *testing.T) {
|
||||
s := NewScheduler(context.Background())
|
||||
s.StartJobEvery(1*time.Minute, func() { fmt.Println("boop") })
|
||||
var jobInterval = time.Second
|
||||
|
||||
err := s.Shutdown()
|
||||
assert.NoError(t, err, "Shutdown should return no errors")
|
||||
assert.Empty(t, s.crontab.Entries(), "all jobs should have been removed")
|
||||
}
|
||||
|
||||
func Test_CanTerminateByCancellingContext(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
s := NewScheduler(ctx)
|
||||
s.StartJobEvery(1*time.Minute, func() { fmt.Println("boop") })
|
||||
|
||||
cancel()
|
||||
|
||||
for i := 0; i < 100; i++ {
|
||||
if len(s.crontab.Entries()) == 0 {
|
||||
return
|
||||
}
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
}
|
||||
t.Fatal("all jobs are expected to be cleaned by now; it might be a timing issue, otherwise implementation defect")
|
||||
}
|
||||
|
||||
func Test_StartAndStopJob(t *testing.T) {
|
||||
func Test_ScheduledJobRuns(t *testing.T) {
|
||||
s := NewScheduler(context.Background())
|
||||
defer s.Shutdown()
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*jobInterval)
|
||||
|
||||
var jobOne string
|
||||
var workDone bool
|
||||
jobOne = s.StartJobEvery(time.Second, func() {
|
||||
assert.Equal(t, 1, len(s.crontab.Entries()), "scheduler should have one active job")
|
||||
s.StartJobEvery(jobInterval, func() error {
|
||||
workDone = true
|
||||
|
||||
s.StopJob(jobOne)
|
||||
cancel()
|
||||
return nil
|
||||
})
|
||||
|
||||
<-ctx.Done()
|
||||
assert.True(t, workDone, "value should been set in the job")
|
||||
assert.Equal(t, 0, len(s.crontab.Entries()), "scheduler should have no active jobs")
|
||||
|
||||
}
|
||||
|
||||
func Test_JobCanBeStopped(t *testing.T) {
|
||||
s := NewScheduler(context.Background())
|
||||
defer s.Shutdown()
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*jobInterval)
|
||||
|
||||
var workDone bool
|
||||
jobID := s.StartJobEvery(jobInterval, func() error {
|
||||
workDone = true
|
||||
|
||||
cancel()
|
||||
return nil
|
||||
})
|
||||
s.StopJob(jobID)
|
||||
|
||||
<-ctx.Done()
|
||||
assert.False(t, workDone, "job shouldn't had a chance to run")
|
||||
}
|
||||
|
||||
func Test_JobShouldStop_UponError(t *testing.T) {
|
||||
s := NewScheduler(context.Background())
|
||||
defer s.Shutdown()
|
||||
|
||||
var acc int
|
||||
s.StartJobEvery(jobInterval, func() error {
|
||||
acc++
|
||||
return fmt.Errorf("failed")
|
||||
})
|
||||
|
||||
<-time.After(3 * jobInterval)
|
||||
assert.Equal(t, 1, acc, "job stop after the first run because it returns an error")
|
||||
}
|
||||
|
||||
func Test_CanTerminateAllJobs_ByShuttingDownScheduler(t *testing.T) {
|
||||
s := NewScheduler(context.Background())
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*jobInterval)
|
||||
|
||||
var workDone bool
|
||||
s.StartJobEvery(jobInterval, func() error {
|
||||
workDone = true
|
||||
|
||||
cancel()
|
||||
return nil
|
||||
})
|
||||
|
||||
s.Shutdown()
|
||||
|
||||
<-ctx.Done()
|
||||
assert.False(t, workDone, "job shouldn't had a chance to run")
|
||||
}
|
||||
|
||||
func Test_CanTerminateAllJobs_ByCancellingParentContext(t *testing.T) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*jobInterval)
|
||||
s := NewScheduler(ctx)
|
||||
|
||||
var workDone bool
|
||||
s.StartJobEvery(jobInterval, func() error {
|
||||
workDone = true
|
||||
|
||||
cancel()
|
||||
return nil
|
||||
})
|
||||
|
||||
cancel()
|
||||
|
||||
<-ctx.Done()
|
||||
assert.False(t, workDone, "job shouldn't had a chance to run")
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue