Merge pull request #188 from gianlucam76/prep

Prepare dev to main merge

Makefile

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

go.mod

@@ -12,9 +12,9 @@ require (
 	github.com/onsi/ginkgo/v2 v2.13.1
 	github.com/onsi/gomega v1.30.0
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/addon-controller v0.20.0
-	github.com/projectsveltos/event-manager v0.20.0
-	github.com/projectsveltos/libsveltos v0.20.0
+	github.com/projectsveltos/addon-controller v0.20.1-0.20231129100117-bfbd565b5b64
+	github.com/projectsveltos/event-manager v0.20.1-0.20231129104244-66bfec0123db
+	github.com/projectsveltos/libsveltos v0.20.1-0.20231129081648-ef5be475b0c0
 	github.com/robfig/cron/v3 v3.0.1
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.28.4
@@ -23,7 +23,7 @@ require (
 	k8s.io/client-go v0.28.4
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/kubectl v0.28.4
-	sigs.k8s.io/cluster-api v1.6.0-rc.0
+	sigs.k8s.io/cluster-api v1.6.0-rc.1
 	sigs.k8s.io/controller-runtime v0.16.3
 	sigs.k8s.io/yaml v1.4.0
 )

go.sum

@@ -339,12 +339,12 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
-github.com/projectsveltos/addon-controller v0.20.0 h1:4UXytfnu/gChlEwNUjA3SOQjtksxDy2kyT+z+u54Syk=
-github.com/projectsveltos/addon-controller v0.20.0/go.mod h1:5DtuhaArxelYDjGHZUnNpKEXqQgFQsLTZMkE4gqns94=
-github.com/projectsveltos/event-manager v0.20.0 h1:RqU8i5knZGmbeSazlkk3WclQ7YnpvJ9+HeOF7O/4Vuo=
-github.com/projectsveltos/event-manager v0.20.0/go.mod h1:+SmFEdI5e3LYXEwlX30L2zwe83QZh/xz956tga8ZyE4=
-github.com/projectsveltos/libsveltos v0.20.0 h1:r6FvF0leV0tJKLPPtTPYY4abnaURDL5nM82oz9KlgZk=
-github.com/projectsveltos/libsveltos v0.20.0/go.mod h1:ic4c80nscNFEDir7E2bRnMjoHVVWFP844T2VNyV2xjo=
+github.com/projectsveltos/addon-controller v0.20.1-0.20231129100117-bfbd565b5b64 h1:N/S41Nt8MHAfrEOTAYVZUFPhkHIxX2vonAZ0MreBzh0=
+github.com/projectsveltos/addon-controller v0.20.1-0.20231129100117-bfbd565b5b64/go.mod h1:kJRKgpXzkDXQhBXfjP6A8lHiHTrmgypOrVF2DNqSGWM=
+github.com/projectsveltos/event-manager v0.20.1-0.20231129104244-66bfec0123db h1:xH/ihkZnXjaaSWhc2/WFAf/dUYSwuouMv1MgVO74bc4=
+github.com/projectsveltos/event-manager v0.20.1-0.20231129104244-66bfec0123db/go.mod h1:KvDBUL/+UhasWzuI6EbD/ew/qlrW36U2jFOnyJ/DvoA=
+github.com/projectsveltos/libsveltos v0.20.1-0.20231129081648-ef5be475b0c0 h1:X2sl3kxINpYeOrQDkfDR2f772KH23iVf+17IFmghn9c=
+github.com/projectsveltos/libsveltos v0.20.1-0.20231129081648-ef5be475b0c0/go.mod h1:lDfsnHGVIvb9Xs30gevyGkCEJXwo5B22HUo0Ya/+gHA=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
@@ -614,8 +614,8 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=
 oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324=
-sigs.k8s.io/cluster-api v1.6.0-rc.0 h1:1kJCTNAl29hilYt2kbQnZAaHiSdIYrmj6vuvaRXI3N8=
-sigs.k8s.io/cluster-api v1.6.0-rc.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
+sigs.k8s.io/cluster-api v1.6.0-rc.1 h1:Mnp73o0L++Ev1BB9Cpaxv0Hfq0puEm/E19wJdPRU3z0=
+sigs.k8s.io/cluster-api v1.6.0-rc.1/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
 sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
 sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

manifest/manifest.yaml

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