Prepare dev to main merge

Post release v0.36.0

Author: mgianluc

Makefile

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

api/v1alpha1/zz_generated.conversion.go

@@ -12,9 +12,9 @@ require (
 	github.com/onsi/ginkgo/v2 v2.20.0
 	github.com/onsi/gomega v1.34.1
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/addon-controller v0.36.0
-	github.com/projectsveltos/event-manager v0.36.0
-	github.com/projectsveltos/libsveltos v0.36.0
+	github.com/projectsveltos/addon-controller v0.36.1-0.20240818145317-3a48a9aa28bd
+	github.com/projectsveltos/event-manager v0.36.1-0.20240818153031-cf60503c156c
+	github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767
 	github.com/robfig/cron/v3 v3.0.1
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.30.3
@@ -51,7 +51,7 @@ require (
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/cli v25.0.1+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v25.0.6+incompatible // indirect
+	github.com/docker/docker v26.1.5+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect

go.mod

@@ -90,8 +90,8 @@ github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbT
 github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v25.0.6+incompatible h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg=
-github.com/docker/docker v25.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g=
+github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -370,12 +370,12 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 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.36.0 h1:vLqqdmUZ6UZ0dfTFWPn3TkxluAzdY/+exTDz4CY/xak=
-github.com/projectsveltos/addon-controller v0.36.0/go.mod h1:RevBwQFeuJBYzvRADP0yfU3o4q8y5i4ybkYWxqgV9IE=
-github.com/projectsveltos/event-manager v0.36.0 h1:eu37qih91bkJlJQhsXuZUD9vMIgmfmodey4pQOcXMUg=
-github.com/projectsveltos/event-manager v0.36.0/go.mod h1:3n8efo+VTBwZupB1sU2zfU/qCtiw1AtwUxsBZBgAwCQ=
-github.com/projectsveltos/libsveltos v0.36.0 h1:hokXDqNwrvKiFrxuUrgC1WYrHN6EwqUh8FHMzIOAdlI=
-github.com/projectsveltos/libsveltos v0.36.0/go.mod h1:+RweK9h48N9E+PFRbictjpzmJaiUgDVDjvz8buhAC3s=
+github.com/projectsveltos/addon-controller v0.36.1-0.20240818145317-3a48a9aa28bd h1:e9ESwTH7n87OkeTyRyZHFE6WyBEGE/oQlLp1vbcfd9g=
+github.com/projectsveltos/addon-controller v0.36.1-0.20240818145317-3a48a9aa28bd/go.mod h1:eBHjcSN3xdVc+DlgQtq0Ubxw4ofzbsVyMHx/r67mH80=
+github.com/projectsveltos/event-manager v0.36.1-0.20240818153031-cf60503c156c h1:UokIbp6OuxjL+yLDRz+tzAQ2dovWMY/yu0F8DPQR8Rg=
+github.com/projectsveltos/event-manager v0.36.1-0.20240818153031-cf60503c156c/go.mod h1:6p3WwJVBq2k9e7nlri+OnptTsZjh79DZpZbDNCan+nU=
+github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767 h1:1kwlkZN7/ccVq6y+vwVQrGiaK50aB5YFTglun2gxBdk=
+github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767/go.mod h1:+RweK9h48N9E+PFRbictjpzmJaiUgDVDjvz8buhAC3s=
 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=

go.sum

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