From 7e82d78a8a8528ff0dcb5e5ef499a904685cc30b Mon Sep 17 00:00:00 2001
From: mgianluc <mgianluca@cisco.com>
Date: Thu, 17 Aug 2023 15:44:55 +0200
Subject: [PATCH] Prepare dev to main merge

Post release v0.15.1
---
 Makefile                                         | 2 +-
 config/default/manager_image_patch.yaml          | 2 +-
 go.mod                                           | 2 +-
 go.sum                                           | 4 ++--
 manifest/manifest.yaml                           | 2 +-
 pkg/drift-detection/drift-detection-manager.go   | 2 +-
 pkg/drift-detection/drift-detection-manager.yaml | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ee6fbe4e..03702db1 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ ARCH ?= amd64
 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.15.1
+TAG ?= main
 
 # Get cluster-api version and build ldflags
 clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index 2b7d482d..b0e3a6ce 100644
--- a/config/default/manager_image_patch.yaml
+++ b/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-amd64:v0.15.1
+      - image: projectsveltos/addon-controller-amd64:main
         name: controller
diff --git a/go.mod b/go.mod
index 91bcfac1..648e7512 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ 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/libsveltos v0.15.1
+	github.com/projectsveltos/libsveltos v0.15.2-0.20230809060457-84a0ee57d801
 	github.com/prometheus/client_golang v1.16.0
 	github.com/spf13/pflag v1.0.5
 	github.com/yuin/gopher-lua v1.1.0
diff --git a/go.sum b/go.sum
index 3fb5f802..dc2b3506 100644
--- a/go.sum
+++ b/go.sum
@@ -557,8 +557,8 @@ 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/libsveltos v0.15.1 h1:Rp7lbcjwODJmuhupTWHG9DMs0mrKt4wneiaIeWLaQI8=
-github.com/projectsveltos/libsveltos v0.15.1/go.mod h1:7PaqLwqxsnsG+lV07m4RO4rOg2gKhlmpJVanWcB84JQ=
+github.com/projectsveltos/libsveltos v0.15.2-0.20230809060457-84a0ee57d801 h1:Cbd9O2vdzi7efkWjCrfLp2SIu/K8GfzfD4pubN0XnBM=
+github.com/projectsveltos/libsveltos v0.15.2-0.20230809060457-84a0ee57d801/go.mod h1:7PaqLwqxsnsG+lV07m4RO4rOg2gKhlmpJVanWcB84JQ=
 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=
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index 8d937e13..8e4e8570 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -1861,7 +1861,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/addon-controller-amd64:v0.15.1
+        image: projectsveltos/addon-controller-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/pkg/drift-detection/drift-detection-manager.go b/pkg/drift-detection/drift-detection-manager.go
index e184eb98..a5b0c62e 100644
--- a/pkg/drift-detection/drift-detection-manager.go
+++ b/pkg/drift-detection/drift-detection-manager.go
@@ -259,7 +259,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager-amd64:v0.15.1
+        image: projectsveltos/drift-detection-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/pkg/drift-detection/drift-detection-manager.yaml b/pkg/drift-detection/drift-detection-manager.yaml
index f036469b..39c4aa25 100644
--- a/pkg/drift-detection/drift-detection-manager.yaml
+++ b/pkg/drift-detection/drift-detection-manager.yaml
@@ -241,7 +241,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager-amd64:v0.15.1
+        image: projectsveltos/drift-detection-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz