Merge pull request #87 from gianlucam76/prep

Prepare dev to main merge
projectsveltos · Aug 18, 2024 · 5cb86d3 · 5cb86d3
2 parents ceae38f + 13fbc59
commit 5cb86d3
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -36,7 +36,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.36.0
+TAG ?= main
 
 ## Tool Binaries
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen

diff --git 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: docker.io/projectsveltos/shard-controller:v0.36.0
+      - image: docker.io/projectsveltos/shard-controller:main
         name: manager
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.20.0
 	github.com/onsi/gomega v1.34.1
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.36.0
+	github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/text v0.17.0
 	k8s.io/api v0.30.3

diff --git a/go.sum b/go.sum
@@ -108,8 +108,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.36.0 h1:hokXDqNwrvKiFrxuUrgC1WYrHN6EwqUh8FHMzIOAdlI=
-github.com/projectsveltos/libsveltos v0.36.0/go.mod h1:+RweK9h48N9E+PFRbictjpzmJaiUgDVDjvz8buhAC3s=
+github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767 h1:1kwlkZN7/ccVq6y+vwVQrGiaK50aB5YFTglun2gxBdk=
+github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767/go.mod h1:+RweK9h48N9E+PFRbictjpzmJaiUgDVDjvz8buhAC3s=
 github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
 github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=

diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
@@ -144,7 +144,7 @@ spec:
         - --report-mode=0
         command:
         - /manager
-        image: docker.io/projectsveltos/shard-controller:v0.36.0
+        image: docker.io/projectsveltos/shard-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml
@@ -23,10 +23,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.36.0
+        - --version=main
         command:
         - /manager
-        image: docker.io/projectsveltos/addon-controller:v0.36.0
+        image: docker.io/projectsveltos/addon-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/addon-controller.go b/pkg/sharding/addon-controller.go
@@ -41,10 +41,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.36.0
+        - --version=main
         command:
         - /manager
-        image: docker.io/projectsveltos/addon-controller:v0.36.0
+        image: docker.io/projectsveltos/addon-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go
@@ -41,10 +41,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.36.0
+        - --version=main
         command:
         - /manager
-        image: docker.io/projectsveltos/classifier:v0.36.0
+        image: docker.io/projectsveltos/classifier:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml
@@ -23,10 +23,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.36.0
+        - --version=main
         command:
         - /manager
-        image: docker.io/projectsveltos/classifier:v0.36.0
+        image: docker.io/projectsveltos/classifier:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml
@@ -24,7 +24,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: docker.io/projectsveltos/event-manager:v0.36.0
+        image: docker.io/projectsveltos/event-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/event-manager.go b/pkg/sharding/event-manager.go
@@ -42,7 +42,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: docker.io/projectsveltos/event-manager:v0.36.0
+        image: docker.io/projectsveltos/event-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/healthcheck-manager.go b/pkg/sharding/healthcheck-manager.go
@@ -42,7 +42,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: docker.io/projectsveltos/healthcheck-manager:v0.36.0
+        image: docker.io/projectsveltos/healthcheck-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml
@@ -24,7 +24,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: docker.io/projectsveltos/healthcheck-manager:v0.36.0
+        image: docker.io/projectsveltos/healthcheck-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml
@@ -24,7 +24,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltoscluster-manager:v0.36.0
+        image: docker.io/projectsveltos/sveltoscluster-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/pkg/sharding/sveltoscluster-manager.go b/pkg/sharding/sveltoscluster-manager.go
@@ -42,7 +42,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltoscluster-manager:v0.36.0
+        image: docker.io/projectsveltos/sveltoscluster-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet: