Merge pull request #640 from gianlucam76/prep

Prepare dev to main merge

Author: gianlucam76

Makefile

@@ -25,7 +25,7 @@ ARCH ?= $(shell go env GOARCH)
 OS ?= $(shell uname -s | tr A-Z a-z)
 K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
 export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= v0.34.2
+TAG ?= main
 
 .PHONY: all
 all: build

config/default/manager_auth_proxy_patch.yaml

@@ -15,4 +15,4 @@ spec:
         - "--report-mode=0"
         - --shard-key=
         - "--v=5"
-        - "--version=v0.34.2"
+        - "--version=main"

config/default/manager_image_patch.yaml

@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: projectsveltos/addon-controller:v0.34.2
+      - image: projectsveltos/addon-controller:main
         name: controller

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.34.2
+	github.com/projectsveltos/libsveltos v0.34.2-0.20240716085602-4631ad816a10
 	github.com/prometheus/client_golang v1.19.1
 	github.com/spf13/pflag v1.0.5
 	github.com/yuin/gopher-lua v1.1.1

go.sum

@@ -364,8 +364,8 @@ 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/libsveltos v0.34.2 h1:YINaz1En1w7oRu3zO38zWzqNmfyHr9aFYD8PQlqUrxI=
-github.com/projectsveltos/libsveltos v0.34.2/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
+github.com/projectsveltos/libsveltos v0.34.2-0.20240716085602-4631ad816a10 h1:iF28HwpqfLKCNya5Q0kaLm6joQEIS5nQOgeXwFTOh54=
+github.com/projectsveltos/libsveltos v0.34.2-0.20240716085602-4631ad816a10/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
 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=

manifest/deployment-agentless.yaml

@@ -23,10 +23,10 @@ spec:
         - --report-mode=0
         - --agent-in-mgmt-cluster
         - --v=5
-        - --version=v0.34.2
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/addon-controller:v0.34.2
+        image: projectsveltos/addon-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

manifest/deployment-shard.yaml

@@ -23,10 +23,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.34.2
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/addon-controller:v0.34.2
+        image: projectsveltos/addon-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

manifest/manifest.yaml

@@ -8405,10 +8405,10 @@ spec:
         - --report-mode=0
         - --shard-key=
         - --v=5
-        - --version=v0.34.2
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/addon-controller:v0.34.2
+        image: projectsveltos/addon-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go

@@ -46,7 +46,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager:v0.34.2
+        image: projectsveltos/drift-detection-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml

@@ -28,7 +28,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager:v0.34.2
+        image: projectsveltos/drift-detection-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet: