Merge pull request #270 from gianlucam76/prep

Prepare dev to main merge

Author: gianlucam76

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.12.0
+TAG ?= main
 
 # Get cluster-api version and build ldflags
 clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)

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.12.0
+      - image: projectsveltos/addon-controller-amd64:main
         name: controller

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.12.0
+	github.com/projectsveltos/libsveltos v0.12.1-0.20230704163255-7f5099a7ffd0
 	github.com/prometheus/client_golang v1.16.0
 	github.com/spf13/pflag v1.0.5
 	github.com/yuin/gopher-lua v1.1.0

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.12.0 h1:tlFcFGN51UJS7m1b1+8OT/AYOjsvPWcgYLLZbMi9O9U=
-github.com/projectsveltos/libsveltos v0.12.0/go.mod h1:2Qq4Iw2e/nYrdI42J6t6Gmkr5S0ozrREzdSAZO17Jkc=
+github.com/projectsveltos/libsveltos v0.12.1-0.20230704163255-7f5099a7ffd0 h1:URTa73p/hJ/rsXqh+Em2mAcTlQbwKg6Sm2FREqpszwE=
+github.com/projectsveltos/libsveltos v0.12.1-0.20230704163255-7f5099a7ffd0/go.mod h1:2Qq4Iw2e/nYrdI42J6t6Gmkr5S0ozrREzdSAZO17Jkc=
 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=

manifest/manifest.yaml

@@ -1843,7 +1843,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/addon-controller-amd64:v0.12.0
+        image: projectsveltos/addon-controller-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

pkg/drift-detection/drift-detection-manager.go

@@ -70,6 +70,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  creationTimestamp: null
   name: drift-detection-manager-role
 rules:
 - apiGroups:
@@ -259,7 +260,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager-amd64:v0.12.0
+        image: projectsveltos/drift-detection-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

pkg/drift-detection/drift-detection-manager.yaml

@@ -52,6 +52,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  creationTimestamp: null
   name: drift-detection-manager-role
 rules:
 - apiGroups:
@@ -241,7 +242,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager-amd64:v0.12.0
+        image: projectsveltos/drift-detection-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz