Merge pull request #176 from gianlucam76/long-running-job-fix

Pick long running job fix

Makefile

@@ -12,7 +12,7 @@ GO_INSTALL := ./scripts/go_install.sh
 REGISTRY ?= projectsveltos
 IMAGE_NAME ?= sveltosctl
 export SVELTOSCTL_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= main
+TAG ?= v0.18.1
 ARCH ?= amd64
 
 # Directories.

go.mod

@@ -12,10 +12,10 @@ require (
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.8
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/addon-controller v0.18.1-0.20231007170146-547a43fd6a10
-	github.com/projectsveltos/event-manager v0.18.1-0.20231007173208-8aadc06fcb4e
-	github.com/projectsveltos/libsveltos v0.18.1-0.20231007130619-4f3be4950c13
-	github.com/robfig/cron v1.2.0
+	github.com/projectsveltos/addon-controller v0.18.1
+	github.com/projectsveltos/event-manager v0.18.1
+	github.com/projectsveltos/libsveltos v0.18.1
+	github.com/robfig/cron/v3 v3.0.1
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.27.3
 	k8s.io/apiextensions-apiserver v0.27.3

go.sum

@@ -559,12 +559,12 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
 github.com/poy/onpar v0.0.0-20200406201722-06f95a1c68e8/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU=
 github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
 github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
-github.com/projectsveltos/addon-controller v0.18.1-0.20231007170146-547a43fd6a10 h1:rG5Pu12XTm73/bIdl5i+cNU6o1CXcq3EIV7uWHv7Oik=
-github.com/projectsveltos/addon-controller v0.18.1-0.20231007170146-547a43fd6a10/go.mod h1:QR6AGBxxjZNFITtWP8YVnubPCx6u2xKopsVbtDVwJEQ=
-github.com/projectsveltos/event-manager v0.18.1-0.20231007173208-8aadc06fcb4e h1:fpHsOfa3dkpzHg8yHCiOuOIoiuo3NvDVLgGX2kd9ymY=
-github.com/projectsveltos/event-manager v0.18.1-0.20231007173208-8aadc06fcb4e/go.mod h1:aIqD4UgZtmZHQMPAqpoSygXZoQGaD76yk9qGDtUxAVQ=
-github.com/projectsveltos/libsveltos v0.18.1-0.20231007130619-4f3be4950c13 h1:Qf1rsv7rnHWn0Bblpo3PM37JgU6ZNfZ7GhW6rB7TMiI=
-github.com/projectsveltos/libsveltos v0.18.1-0.20231007130619-4f3be4950c13/go.mod h1:4O07OQ3apCERUugy+9k3KOc1MByW727b2dMVAwnLHnM=
+github.com/projectsveltos/addon-controller v0.18.1 h1:kgyeVdJDEhuVW++YRi7yHUj+QybIKfEjPvctFRoGT48=
+github.com/projectsveltos/addon-controller v0.18.1/go.mod h1:IihafpiwT3ThX33fBkhD+oMcp5HxLB0p+0c5Ey6LQj0=
+github.com/projectsveltos/event-manager v0.18.1 h1:AihW9wGT0eA2TJd7t8Ax164+BJSq6qBlf79Yi3x6984=
+github.com/projectsveltos/event-manager v0.18.1/go.mod h1:SbB+D/LRWD2pnTCp79rKnoJZThmyfUco7OjoxQNGnbY=
+github.com/projectsveltos/libsveltos v0.18.1 h1:pJD4BXavrV/HtXyrFrGPPxjWBZuHmomvrw8esVGJ3+Y=
+github.com/projectsveltos/libsveltos v0.18.1/go.mod h1:4O07OQ3apCERUugy+9k3KOc1MByW727b2dMVAwnLHnM=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -592,8 +592,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=
 github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
-github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

internal/commands/reconciler_utils.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/robfig/cron"
+	"github.com/robfig/cron/v3"
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

manifest/manifest.yaml

@@ -46,7 +46,7 @@ spec:
       serviceAccountName: sveltosctl
       containers:
       - name: sveltosctl
-        image: projectsveltos/sveltosctl-amd64:main
+        image: projectsveltos/sveltosctl-amd64:v0.18.1
         imagePullPolicy: IfNotPresent
         command:
           - /sveltosctl