From d513818760305be1fb128df3d40b270a67e6051d Mon Sep 17 00:00:00 2001
From: mgianluc <mgianluca@cisco.com>
Date: Wed, 29 Nov 2023 10:11:37 +0100
Subject: [PATCH] Prepare dev to main merge

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

diff --git a/Makefile b/Makefile
index f514a7f..c8eb897 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.20.0
+TAG ?= main
 
 .PHONY: all
 all: build
@@ -70,7 +70,7 @@ KUBECTL := $(TOOLS_BIN_DIR)/kubectl
 CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl
 
 GOLANGCI_LINT_VERSION := "v1.52.2"
-CLUSTERCTL_VERSION := "v1.5.3"
+CLUSTERCTL_VERSION := "v1.6.0-rc.1"
 
 $(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
 	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-tools/cmd/controller-gen
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index fc7174f..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.20.0
+      - image: projectsveltos/addon-compliance-controller-amd64:main
         name: manager
diff --git a/go.mod b/go.mod
index 9875b66..f119186 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ 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/libsveltos v0.20.0
+	github.com/projectsveltos/libsveltos v0.20.1-0.20231129081648-ef5be475b0c0
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/text v0.14.0
 	k8s.io/api v0.28.4
@@ -22,7 +22,7 @@ require (
 	k8s.io/component-base v0.28.4
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	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
 )
 
diff --git a/go.sum b/go.sum
index 47ab139..fb8261d 100644
--- a/go.sum
+++ b/go.sum
@@ -141,8 +141,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.20.0 h1:r6FvF0leV0tJKLPPtTPYY4abnaURDL5nM82oz9KlgZk=
-github.com/projectsveltos/libsveltos v0.20.0/go.mod h1:ic4c80nscNFEDir7E2bRnMjoHVVWFP844T2VNyV2xjo=
+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 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=
@@ -274,8 +274,8 @@ k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4Va
 k8s.io/kubectl v0.28.4 h1:gWpUXW/T7aFne+rchYeHkyB8eVDl5UZce8G4X//kjUQ=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-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=
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index 4d5a93c..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.20.0
+        image: projectsveltos/addon-compliance-controller-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz