Merge pull request #29 from gianlucam76/prep

Prepare dev to main merge
projectsveltos · Feb 9, 2024 · c04a36a · c04a36a
2 parents 4ce8e20 + 592e340
commit c04a36a
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.23.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: projectsveltos/shard-controller-amd64:v0.23.0
+      - image: projectsveltos/shard-controller-amd64:main
         name: manager
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.15.0
 	github.com/onsi/gomega v1.31.1
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.23.0
+	github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/text v0.14.0
 	k8s.io/api v0.29.1

diff --git a/go.sum b/go.sum
@@ -99,8 +99,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.23.0 h1:j1Wsa+EDi1kbhjLDCVqHF4pnIANswUitSTPKcwaMUKc=
-github.com/projectsveltos/libsveltos v0.23.0/go.mod h1:CUdg31JkncVRQY6AIEQGjT2Mj6OCDckdS6OKwG9o8ek=
+github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7 h1:Uot2pLDyybJSjl8yAXB2qGDCri7qLnoM8t+NYRw0TGA=
+github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7/go.mod h1:h2NUzyHkIc9u6T4NOQzpPnJmX8Rrumpmszo8wM8BUkA=
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
 github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=

diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
@@ -224,7 +224,7 @@ spec:
         - --report-mode=0
         command:
         - /manager
-        image: projectsveltos/shard-controller-amd64:v0.23.0
+        image: projectsveltos/shard-controller-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml
@@ -24,10 +24,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.23.0
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/addon-controller-amd64:v0.23.0
+        image: projectsveltos/addon-controller-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/addon-controller.go b/pkg/sharding/addon-controller.go
@@ -42,10 +42,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.23.0
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/addon-controller-amd64:v0.23.0
+        image: projectsveltos/addon-controller-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go
@@ -42,10 +42,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.23.0
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/classifier-amd64:v0.23.0
+        image: projectsveltos/classifier-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml
@@ -24,10 +24,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.23.0
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/classifier-amd64:v0.23.0
+        image: projectsveltos/classifier-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml
@@ -25,7 +25,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/event-manager-amd64:v0.23.0
+        image: projectsveltos/event-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/event-manager.go b/pkg/sharding/event-manager.go
@@ -43,7 +43,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/event-manager-amd64:v0.23.0
+        image: projectsveltos/event-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/healthcheck-manager.go b/pkg/sharding/healthcheck-manager.go
@@ -43,7 +43,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/healthcheck-manager-amd64:v0.23.0
+        image: projectsveltos/healthcheck-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml
@@ -25,7 +25,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/healthcheck-manager-amd64:v0.23.0
+        image: projectsveltos/healthcheck-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml
@@ -25,7 +25,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/sveltoscluster-manager-amd64:v0.23.0
+        image: projectsveltos/sveltoscluster-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pkg/sharding/sveltoscluster-manager.go b/pkg/sharding/sveltoscluster-manager.go
@@ -43,7 +43,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/sveltoscluster-manager-amd64:v0.23.0
+        image: projectsveltos/sveltoscluster-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz