From 61efe88fbbaf25c79ae004215345e406e1b95a8d Mon Sep 17 00:00:00 2001
From: mgianluc <mgianluca@cisco.com>
Date: Thu, 4 Jan 2024 17:40:00 +0100
Subject: [PATCH] Prepare dev to main merge

Post release v0.21.0
---
 Makefile                                | 2 +-
 config/default/manager_image_patch.yaml | 2 +-
 go.mod                                  | 2 +-
 go.sum                                  | 4 ++--
 manifest/manifest.yaml                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 31dfb63..08e7466 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.21.0
+TAG ?= main
 
 .PHONY: all
 all: build
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index 10225f8..c4ff0ce 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-compliance-controller-amd64:v0.21.0
+      - image: projectsveltos/addon-compliance-controller-amd64:main
         name: manager
diff --git a/go.mod b/go.mod
index b5f40fb..2657ab5 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.13.2
 	github.com/onsi/gomega v1.30.0
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.21.0
+	github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/text v0.14.0
 	k8s.io/api v0.28.5
diff --git a/go.sum b/go.sum
index d7959e1..826ced4 100644
--- a/go.sum
+++ b/go.sum
@@ -150,8 +150,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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/projectsveltos/libsveltos v0.21.0 h1:NkkGiDbQJyp0WuPkioS4pHzmRwy8XtomNC4dJrZ4mW8=
-github.com/projectsveltos/libsveltos v0.21.0/go.mod h1:HnXXTWK9BqzoN4aAQs0kdjK7wpsaSz0nNemN4rMruV4=
+github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445 h1:BRQmPXAGVKTWq5GdlvPPZmAe4D5bmR8Bum1pqPCEd8w=
+github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445/go.mod h1:HnXXTWK9BqzoN4aAQs0kdjK7wpsaSz0nNemN4rMruV4=
 github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
 github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
 github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index db87bc0..e9e7371 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -269,7 +269,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/addon-compliance-controller-amd64:v0.21.0
+        image: projectsveltos/addon-compliance-controller-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz