From 51a9aa03083907a462e874797413cdddcad60f6c Mon Sep 17 00:00:00 2001 From: mgianluc Date: Mon, 2 Dec 2024 13:33:04 +0100 Subject: [PATCH 1/2] Prepare for release v0.43.0 --- Makefile | 2 +- config/default/manager_image_patch.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- manifest/manifest.yaml | 2 +- pkg/sharding/ac.yaml | 4 ++-- pkg/sharding/addon-controller.go | 4 ++-- pkg/sharding/classifier.go | 4 ++-- pkg/sharding/classifier.yaml | 4 ++-- pkg/sharding/em.yaml | 4 ++-- pkg/sharding/event-manager.go | 4 ++-- pkg/sharding/healthcheck-manager.go | 4 ++-- pkg/sharding/hm.yaml | 4 ++-- pkg/sharding/sc.yaml | 2 +- pkg/sharding/sveltoscluster-manager.go | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 461cea3..e8a4d18 100644 --- 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 ?= main +TAG ?= v0.43.0 ## 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 index f338475..0390fd5 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: docker.io/projectsveltos/shard-controller:main + - image: docker.io/projectsveltos/shard-controller:v0.43.0 name: manager diff --git a/go.mod b/go.mod index 11b3ef6..1a9658c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.0 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.42.2-0.20241201085419-c94a994b898c + github.com/projectsveltos/libsveltos v0.43.0 github.com/spf13/pflag v1.0.5 golang.org/x/text v0.20.0 k8s.io/api v0.31.3 diff --git a/go.sum b/go.sum index 8bd17e4..3b49687 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/projectsveltos/libsveltos v0.42.2-0.20241201085419-c94a994b898c h1:x/Kg8+bSipfGhw9jpRVd05laNgRnHJofwd1qdiCqVwU= -github.com/projectsveltos/libsveltos v0.42.2-0.20241201085419-c94a994b898c/go.mod h1:4hqQRjwZ/DZ6u0haL3zhdARZ3lpspLv57rkhpXIzbsg= +github.com/projectsveltos/libsveltos v0.43.0 h1:3M7r7TbEbMJ3Xlb0MTxK4QDnH+5P5+dT0J+7+iGSUsg= +github.com/projectsveltos/libsveltos v0.43.0/go.mod h1:4hqQRjwZ/DZ6u0haL3zhdARZ3lpspLv57rkhpXIzbsg= github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 564e5c1..1d5e7d6 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -144,7 +144,7 @@ spec: - --report-mode=0 command: - /manager - image: docker.io/projectsveltos/shard-controller:main + image: docker.io/projectsveltos/shard-controller:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml index 6428ba0..c461f76 100644 --- a/pkg/sharding/ac.yaml +++ b/pkg/sharding/ac.yaml @@ -23,7 +23,7 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=main + - --version=v0.43.0 command: - /manager env: @@ -35,7 +35,7 @@ spec: valueFrom: resourceFieldRef: resource: limits.cpu - image: docker.io/projectsveltos/addon-controller:main + image: docker.io/projectsveltos/addon-controller:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/addon-controller.go b/pkg/sharding/addon-controller.go index de13fa0..790a97e 100644 --- a/pkg/sharding/addon-controller.go +++ b/pkg/sharding/addon-controller.go @@ -41,7 +41,7 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=main + - --version=v0.43.0 command: - /manager env: @@ -53,7 +53,7 @@ spec: valueFrom: resourceFieldRef: resource: limits.cpu - image: docker.io/projectsveltos/addon-controller:main + image: docker.io/projectsveltos/addon-controller:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go index dcab1d9..4281dd3 100644 --- a/pkg/sharding/classifier.go +++ b/pkg/sharding/classifier.go @@ -41,10 +41,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=main + - --version=v0.43.0 command: - /manager - image: docker.io/projectsveltos/classifier:main + image: docker.io/projectsveltos/classifier:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml index 2ace9b5..3dbafef 100644 --- a/pkg/sharding/classifier.yaml +++ b/pkg/sharding/classifier.yaml @@ -23,10 +23,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=main + - --version=v0.43.0 command: - /manager - image: docker.io/projectsveltos/classifier:main + image: docker.io/projectsveltos/classifier:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml index 2227b9f..33f4887 100644 --- a/pkg/sharding/em.yaml +++ b/pkg/sharding/em.yaml @@ -22,10 +22,10 @@ spec: - --diagnostics-address=:8443 - --shard-key={{.SHARD}} - --v=5 - - --version=main + - --version=v0.43.0 command: - /manager - image: docker.io/projectsveltos/event-manager:main + image: docker.io/projectsveltos/event-manager:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/event-manager.go b/pkg/sharding/event-manager.go index 3b68f7b..a8acca8 100644 --- a/pkg/sharding/event-manager.go +++ b/pkg/sharding/event-manager.go @@ -40,10 +40,10 @@ spec: - --diagnostics-address=:8443 - --shard-key={{.SHARD}} - --v=5 - - --version=main + - --version=v0.43.0 command: - /manager - image: docker.io/projectsveltos/event-manager:main + image: docker.io/projectsveltos/event-manager:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/healthcheck-manager.go b/pkg/sharding/healthcheck-manager.go index 89844f2..02db270 100644 --- a/pkg/sharding/healthcheck-manager.go +++ b/pkg/sharding/healthcheck-manager.go @@ -40,10 +40,10 @@ spec: - --diagnostics-address=:8443 - --shard-key={{.SHARD}} - --v=5 - - --version=main + - --version=v0.43.0 command: - /manager - image: docker.io/projectsveltos/healthcheck-manager:main + image: docker.io/projectsveltos/healthcheck-manager:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml index 0c1d9c4..75bc69d 100644 --- a/pkg/sharding/hm.yaml +++ b/pkg/sharding/hm.yaml @@ -22,10 +22,10 @@ spec: - --diagnostics-address=:8443 - --shard-key={{.SHARD}} - --v=5 - - --version=main + - --version=v0.43.0 command: - /manager - image: docker.io/projectsveltos/healthcheck-manager:main + image: docker.io/projectsveltos/healthcheck-manager:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml index bc910d2..aa4907d 100644 --- 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:main + image: docker.io/projectsveltos/sveltoscluster-manager:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/sveltoscluster-manager.go b/pkg/sharding/sveltoscluster-manager.go index d90d48d..05ac398 100644 --- 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:main + image: docker.io/projectsveltos/sveltoscluster-manager:v0.43.0 livenessProbe: failureThreshold: 3 httpGet: From f66949693f11ccfc91f6996c79ddcfbaa62d5e83 Mon Sep 17 00:00:00 2001 From: mgianluc Date: Mon, 2 Dec 2024 13:38:01 +0100 Subject: [PATCH 2/2] Advance libsveltos pin Set tag --- Makefile | 2 +- config/default/manager_image_patch.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- manifest/manifest.yaml | 2 +- pkg/sharding/ac.yaml | 4 ++-- pkg/sharding/addon-controller.go | 4 ++-- pkg/sharding/classifier.go | 4 ++-- pkg/sharding/classifier.yaml | 4 ++-- pkg/sharding/em.yaml | 4 ++-- pkg/sharding/event-manager.go | 4 ++-- pkg/sharding/healthcheck-manager.go | 4 ++-- pkg/sharding/hm.yaml | 4 ++-- pkg/sharding/sc.yaml | 2 +- pkg/sharding/sveltoscluster-manager.go | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index e8a4d18..461cea3 100644 --- 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.43.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 index 0390fd5..f338475 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: docker.io/projectsveltos/shard-controller:v0.43.0 + - image: docker.io/projectsveltos/shard-controller:main name: manager diff --git a/go.mod b/go.mod index 1a9658c..3913001 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.0 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.43.0 + github.com/projectsveltos/libsveltos v0.43.1-0.20241201131544-c4c2550af4af github.com/spf13/pflag v1.0.5 golang.org/x/text v0.20.0 k8s.io/api v0.31.3 diff --git a/go.sum b/go.sum index 3b49687..bec5f16 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/projectsveltos/libsveltos v0.43.0 h1:3M7r7TbEbMJ3Xlb0MTxK4QDnH+5P5+dT0J+7+iGSUsg= -github.com/projectsveltos/libsveltos v0.43.0/go.mod h1:4hqQRjwZ/DZ6u0haL3zhdARZ3lpspLv57rkhpXIzbsg= +github.com/projectsveltos/libsveltos v0.43.1-0.20241201131544-c4c2550af4af h1:rkf6H9XqWmO10dTmZIsns7Zgcw4+vvnLa1bUrURPoJA= +github.com/projectsveltos/libsveltos v0.43.1-0.20241201131544-c4c2550af4af/go.mod h1:4hqQRjwZ/DZ6u0haL3zhdARZ3lpspLv57rkhpXIzbsg= github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 1d5e7d6..564e5c1 100644 --- 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.43.0 + image: docker.io/projectsveltos/shard-controller:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml index c461f76..6428ba0 100644 --- a/pkg/sharding/ac.yaml +++ b/pkg/sharding/ac.yaml @@ -23,7 +23,7 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.43.0 + - --version=main command: - /manager env: @@ -35,7 +35,7 @@ spec: valueFrom: resourceFieldRef: resource: limits.cpu - image: docker.io/projectsveltos/addon-controller:v0.43.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 index 790a97e..de13fa0 100644 --- a/pkg/sharding/addon-controller.go +++ b/pkg/sharding/addon-controller.go @@ -41,7 +41,7 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.43.0 + - --version=main command: - /manager env: @@ -53,7 +53,7 @@ spec: valueFrom: resourceFieldRef: resource: limits.cpu - image: docker.io/projectsveltos/addon-controller:v0.43.0 + image: docker.io/projectsveltos/addon-controller:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go index 4281dd3..dcab1d9 100644 --- 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.43.0 + - --version=main command: - /manager - image: docker.io/projectsveltos/classifier:v0.43.0 + image: docker.io/projectsveltos/classifier:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml index 3dbafef..2ace9b5 100644 --- 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.43.0 + - --version=main command: - /manager - image: docker.io/projectsveltos/classifier:v0.43.0 + image: docker.io/projectsveltos/classifier:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml index 33f4887..2227b9f 100644 --- a/pkg/sharding/em.yaml +++ b/pkg/sharding/em.yaml @@ -22,10 +22,10 @@ spec: - --diagnostics-address=:8443 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.43.0 + - --version=main command: - /manager - image: docker.io/projectsveltos/event-manager:v0.43.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 index a8acca8..3b68f7b 100644 --- a/pkg/sharding/event-manager.go +++ b/pkg/sharding/event-manager.go @@ -40,10 +40,10 @@ spec: - --diagnostics-address=:8443 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.43.0 + - --version=main command: - /manager - image: docker.io/projectsveltos/event-manager:v0.43.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 index 02db270..89844f2 100644 --- a/pkg/sharding/healthcheck-manager.go +++ b/pkg/sharding/healthcheck-manager.go @@ -40,10 +40,10 @@ spec: - --diagnostics-address=:8443 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.43.0 + - --version=main command: - /manager - image: docker.io/projectsveltos/healthcheck-manager:v0.43.0 + image: docker.io/projectsveltos/healthcheck-manager:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml index 75bc69d..0c1d9c4 100644 --- a/pkg/sharding/hm.yaml +++ b/pkg/sharding/hm.yaml @@ -22,10 +22,10 @@ spec: - --diagnostics-address=:8443 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.43.0 + - --version=main command: - /manager - image: docker.io/projectsveltos/healthcheck-manager:v0.43.0 + image: docker.io/projectsveltos/healthcheck-manager:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml index aa4907d..bc910d2 100644 --- 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.43.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 index 05ac398..d90d48d 100644 --- 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.43.0 + image: docker.io/projectsveltos/sveltoscluster-manager:main livenessProbe: failureThreshold: 3 httpGet: